Merge pull request #1916 from skazi0/nova-early-upgrade

upgrade: Upgrade compute services early (SOC-10273)

Author: skazi0

chef/cookbooks/crowbar/templates/default/crowbar-pre-upgrade.sh.erb

@@ -86,7 +86,11 @@ log "No HA setup found..."
 
 <% if @compute_node %>
 
-log "Restarting services for Pike"
+log "Upgrading packages needed for nova-compute node"
+
+zypper --non-interactive up openstack-nova-compute
+
+log "Restarting services for Rocky"
 
 <% unless @remote_node %>
 systemctl restart <%= @neutron_agent %>

chef/cookbooks/crowbar/templates/default/crowbar-reload-nova-after-upgrade.sh.erb

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# After the upgrade of all services on all nodes is finished, it's
+# After the upgrade of all compute services on all nodes is finished, it's
 # necessary to signal all nova services so that they start using latest RPC API version.
 
 LOGFILE=/var/log/crowbar/node-upgrade.log

crowbar_framework/app/models/api/upgrade.rb

@@ -817,6 +817,8 @@ def do_controllers_substep(substep)
           upgrade_controller_clusters
           upgrade_non_compute_nodes
           prepare_all_compute_nodes
+          reload_nova_services
+
           ::Crowbar::UpgradeStatus.new.save_substep(substep, :finished)
         end
       end
@@ -887,10 +889,6 @@ def nodes(component = "all")
         if status.progress[:remaining_nodes].zero?
           status.save_substep(substep, :finished)
 
-          status.save_substep(:reload_nova, :running)
-          reload_nova_services
-          status.save_substep(:reload_nova, :finished)
-
           status.save_substep(:run_online_migrations, :running)
           run_online_migrations
           status.save_substep(:run_online_migrations, :finished)