openstack
/
python-tripleoclient
Code Issues Proposed changes

Call undercloud pre-upgrade hook 

This will allow us to do most of the implementation of the
undercloud upgrade in instack-undercloud rather than in difficult-
to-update client code (it would be tricky at best to have the client
update itself).

bp undercloud-upgrade

Change-Id: Icb3fe2c1285f8f8574aad583d08c557936ffabe5
Depends-On: I8c614395e4e77f43b117c687cae3441b39f6c40b
This commit is contained in:
Ben Nemec 2017-06-29 21:45:31 +00:00
parent 12299487f8
commit 3a0c8778e8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@ -65,7 +65,9 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_has_calls(
[
mock.call(['sudo', 'yum', 'update', '-y']),
mock.call(['sudo', 'yum', 'update', '-y',
'instack-undercloud']),
mock.call('instack-pre-upgrade-undercloud'),
mock.call('instack-upgrade-undercloud'),
mock.call(['sudo', 'systemctl', 'restart',
'openstack-nova-api'])

4
tripleoclient/v1/undercloud.py
View File

@ -47,7 +47,9 @@ class UpgradeUndercloud(command.Command):
utils.ensure_run_as_normal_user()
subprocess.check_call(['sudo', 'yum', 'update', '-y'])
subprocess.check_call(['sudo', 'yum', 'update', '-y',
'instack-undercloud'])
subprocess.check_call("instack-pre-upgrade-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',