From 3a0c8778e89fa18747e09cff1bacac74e60343e8 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 29 Jun 2017 21:45:31 +0000 Subject: [PATCH] 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 --- tripleoclient/tests/v1/undercloud/test_undercloud.py | 4 +++- tripleoclient/v1/undercloud.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tripleoclient/tests/v1/undercloud/test_undercloud.py b/tripleoclient/tests/v1/undercloud/test_undercloud.py index 5436f71e8..c98fc7830 100644 --- a/tripleoclient/tests/v1/undercloud/test_undercloud.py +++ b/tripleoclient/tests/v1/undercloud/test_undercloud.py @@ -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']) diff --git a/tripleoclient/v1/undercloud.py b/tripleoclient/v1/undercloud.py index d22458c17..47b8a917d 100644 --- a/tripleoclient/v1/undercloud.py +++ b/tripleoclient/v1/undercloud.py @@ -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',