Skip to content

Commit 7defe52

Browse files
committed
[upgrade] Call finalize_nodes_upgrade at the very end (bsc#1155942)
There should be no other upgrade related call after finalize, because finalize deletes all the upgrade scripts and failure in the next step would try to re-run (now non-existing) scripts. Also, update the list of scripts that should be deleted.
1 parent 8da4d26 commit 7defe52

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

crowbar_framework/app/models/api/upgrade.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,8 +893,8 @@ def nodes(component = "all")
893893
run_online_migrations
894894
status.save_substep(:run_online_migrations, :finished)
895895

896-
finalize_nodes_upgrade
897896
unlock_crowbar_ui_package
897+
finalize_nodes_upgrade
898898
status.end_step
899899
end
900900
rescue ::Crowbar::Error::Upgrade::NodeError => e
@@ -1102,7 +1102,14 @@ def delete_upgrade_scripts(node)
11021102
"post-upgrade",
11031103
"chef-upgraded",
11041104
"reload-nova-after-upgrade",
1105-
"run-nova-online-migrations"
1105+
"run-nova-online-migrations",
1106+
"delete-unknown-nova-services",
1107+
"heat-migrations-after-upgrade",
1108+
"migrate-keystone-and-start",
1109+
"nova-migrations-after-upgrade",
1110+
"set-network-agents-state",
1111+
"shutdown-keystone",
1112+
"shutdown-remaining-services"
11061113
].map { |f| "/usr/sbin/crowbar-#{f}.sh" }.join(" ")
11071114
scripts_to_delete << " /etc/neutron/lbaas-connection.conf"
11081115
node.run_ssh_cmd("rm -f #{scripts_to_delete}")

0 commit comments

Comments
 (0)