Switch undercloud upgrade to use upgrade script
In order to better handle upgrades, we need to be able to know when we are performing an upgrade instead of an installation. This change switches the undercloud upgrade process to use the instack-upgrade-undercloud script which will expose the fact that we are running an upgrade process to the underlying puppet scripts. Change-Id: I493204117ca158e99f706770a02fbb7f6392673b Depends-On: Ie3cb21e30334fe8ffc0a9d6e707b42269b64c9ec Related-Bug: #1649341 Related-Blueprint: undercloud-upgrade
This commit is contained in:
parent
bfe804082a
commit
78d4688842
@ -66,7 +66,7 @@ class TestUndercloudUpgrade(TestPluginV1):
|
||||
mock_subprocess.assert_has_calls(
|
||||
[
|
||||
mock.call(['sudo', 'yum', 'update', '-y']),
|
||||
mock.call('instack-install-undercloud'),
|
||||
mock.call('instack-upgrade-undercloud'),
|
||||
mock.call(['sudo', 'systemctl', 'restart',
|
||||
'openstack-nova-api'])
|
||||
]
|
||||
|
@ -48,7 +48,7 @@ class UpgradeUndercloud(command.Command):
|
||||
utils.ensure_run_as_normal_user()
|
||||
|
||||
subprocess.check_call(['sudo', 'yum', 'update', '-y'])
|
||||
subprocess.check_call("instack-install-undercloud")
|
||||
subprocess.check_call("instack-upgrade-undercloud")
|
||||
# restart nova-api https://bugzilla.redhat.com/show_bug.cgi?id=1315467
|
||||
subprocess.check_call(['sudo', 'systemctl', 'restart',
|
||||
'openstack-nova-api'])
|
||||
|
Loading…
Reference in New Issue
Block a user