From a4efa9cf2a050a46e4ac3b27baf98059f5eab6f3 Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Thu, 18 Aug 2016 13:05:00 +0000 Subject: [PATCH] Revert "Upgrades: Add initialization stage to 'overcloud upgrade'" This reverts commit 05502f11be9cdc1ba8b1cf489885d97a85cb6e6a. See for revert reasoning: http://lists.openstack.org/pipermail/openstack-dev/2016-August/101763.html Change-Id: Ia42035a7801a4f584f7a47ce7c2488e076c8dab4 Closes-Bug: #1565807 --- .../test_overcloud_upgrade.py | 25 ------------------- tripleoclient/v1/overcloud_upgrade.py | 5 ++-- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py index 00fc6b14d..3377e6733 100644 --- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py +++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py @@ -43,7 +43,6 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade): upgrade_manager.get_status.assert_called_once_with() upgrade_manager.upgrade.assert_called_once_with() upgrade_manager.upgrade_post.assert_not_called() - upgrade_manager.upgrade_pre.assert_not_called() @mock.patch('tripleo_common.upgrade.StackUpgradeManager', autospec=True) def test_upgrade_answerfile(self, mock_upgrade_manager): @@ -75,7 +74,6 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade): upgrade_manager.get_status.assert_called_once_with() upgrade_manager.upgrade.assert_called_once_with() upgrade_manager.upgrade_post.assert_not_called() - upgrade_manager.upgrade_pre.assert_not_called() called_args = mock_upgrade_manager.call_args[1] self.assertEqual('/tmp/tht', called_args['tht_dir']) @@ -131,26 +129,3 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade): upgrade_manager.get_status.assert_called_once_with() upgrade_manager.upgrade_post.assert_called_once_with() upgrade_manager.upgrade.assert_not_called() - upgrade_manager.upgrade_pre.assert_not_called() - - @mock.patch('tripleo_common.upgrade.StackUpgradeManager') - def test_upgrade_perform_pre(self, mock_upgrade_manager): - upgrade_manager = mock_upgrade_manager.return_value - upgrade_manager.get_status.return_value = ( - 'UPDATE_COMPLETE', {}) - argslist = [ - 'prepare', - '--stack', 'overcloud', - '--templates', - ] - verifylist = [ - ('stage', 'prepare'), - ('stack', 'overcloud'), - ('templates', '/usr/share/openstack-tripleo-heat-templates/'), - ] - parsed_args = self.check_parser(self.cmd, argslist, verifylist) - self.cmd.take_action(parsed_args) - upgrade_manager.get_status.assert_called_once_with() - upgrade_manager.upgrade_pre.assert_called_once_with() - upgrade_manager.upgrade.assert_not_called() - upgrade_manager.upgrade_post.assert_not_called() diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py index f1dbb544b..434f02b74 100644 --- a/tripleoclient/v1/overcloud_upgrade.py +++ b/tripleoclient/v1/overcloud_upgrade.py @@ -33,8 +33,8 @@ class UpgradeOvercloud(command.Command): parser = super(UpgradeOvercloud, self).get_parser(prog_name) parser.add_argument( 'stage', - metavar="", - choices=['prepare', 'start', 'finish'], + metavar="", + choices=['start', 'finish'], help=_('Stage of upgrade to perform.') ) parser.add_argument( @@ -90,7 +90,6 @@ class UpgradeOvercloud(command.Command): print("Starting stack upgrade on stack {0}".format( parsed_args.stack)) stage_func = { - "prepare": upgrade_manager.upgrade_pre, "start": upgrade_manager.upgrade, "finish": upgrade_manager.upgrade_post, }