From ac50ee66939b2c874fa45862544172510873438d Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Thu, 18 Jun 2020 15:26:27 +0200 Subject: [PATCH] Rename UpgradeConvergeOvercloud into UpgradeConverge. To keep consistency between class names for the upgrade library, this patch renames the UpgradeConvergeOvercloud into UpgradeConverge. Change-Id: Ib73a803bf24af876c00583b3793e828fb528a26d (cherry picked from commit cf195c4b0b5a6784fbb8f8b5447e1e3bd409215e) --- setup.cfg | 2 +- tripleoclient/v1/overcloud_upgrade.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index cc0adaeff..86f0afc2c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,7 +97,7 @@ openstack.tripleoclient.v2 = overcloud_update_converge= tripleoclient.v1.overcloud_update:UpdateConverge overcloud_upgrade_prepare = tripleoclient.v1.overcloud_upgrade:UpgradePrepare overcloud_upgrade_run = tripleoclient.v1.overcloud_upgrade:UpgradeRun - overcloud_upgrade_converge = tripleoclient.v1.overcloud_upgrade:UpgradeConvergeOvercloud + overcloud_upgrade_converge = tripleoclient.v1.overcloud_upgrade:UpgradeConverge overcloud_external-update_run = tripleoclient.v1.overcloud_external_update:ExternalUpdateRun overcloud_external-upgrade_run = tripleoclient.v1.overcloud_external_upgrade:ExternalUpgradeRun overcloud_ffwd-upgrade_prepare = tripleoclient.v1.overcloud_ffwd_upgrade:FFWDUpgradePrepare diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py index a7914814f..3c9626755 100644 --- a/tripleoclient/v1/overcloud_upgrade.py +++ b/tripleoclient/v1/overcloud_upgrade.py @@ -237,7 +237,7 @@ class UpgradeRun(command.Command): self.log.info("Completed Overcloud Major Upgrade Run.") -class UpgradeConvergeOvercloud(UpgradePrepare): +class UpgradeConverge(UpgradePrepare): """Major upgrade converge - reset Heat resources in the stored plan This is the last step for completion of a overcloud major @@ -252,4 +252,4 @@ class UpgradeConvergeOvercloud(UpgradePrepare): forbidden_params = constants.UPGRADE_CONVERGE_FORBIDDEN_PARAMS - log = logging.getLogger(__name__ + ".UpgradeConvergeOvercloud") + log = logging.getLogger(__name__ + ".UpgradeConverge")