Merge "Rename UpgradeConvergeOvercloud into UpgradeConverge." into stable/ussuri
This commit is contained in:
commit
a0b1ac5c14
|
@ -97,7 +97,7 @@ openstack.tripleoclient.v2 =
|
||||||
overcloud_update_converge= tripleoclient.v1.overcloud_update:UpdateConverge
|
overcloud_update_converge= tripleoclient.v1.overcloud_update:UpdateConverge
|
||||||
overcloud_upgrade_prepare = tripleoclient.v1.overcloud_upgrade:UpgradePrepare
|
overcloud_upgrade_prepare = tripleoclient.v1.overcloud_upgrade:UpgradePrepare
|
||||||
overcloud_upgrade_run = tripleoclient.v1.overcloud_upgrade:UpgradeRun
|
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-update_run = tripleoclient.v1.overcloud_external_update:ExternalUpdateRun
|
||||||
overcloud_external-upgrade_run = tripleoclient.v1.overcloud_external_upgrade:ExternalUpgradeRun
|
overcloud_external-upgrade_run = tripleoclient.v1.overcloud_external_upgrade:ExternalUpgradeRun
|
||||||
overcloud_generate_fencing = tripleoclient.v1.overcloud_parameters:GenerateFencingParameters
|
overcloud_generate_fencing = tripleoclient.v1.overcloud_parameters:GenerateFencingParameters
|
||||||
|
|
|
@ -262,7 +262,7 @@ class UpgradeRun(command.Command):
|
||||||
self.log.info("Completed Overcloud Major Upgrade Run.")
|
self.log.info("Completed Overcloud Major Upgrade Run.")
|
||||||
|
|
||||||
|
|
||||||
class UpgradeConvergeOvercloud(UpgradePrepare):
|
class UpgradeConverge(UpgradePrepare):
|
||||||
"""Major upgrade converge - reset Heat resources in the stored plan
|
"""Major upgrade converge - reset Heat resources in the stored plan
|
||||||
|
|
||||||
This is the last step for completion of a overcloud major
|
This is the last step for completion of a overcloud major
|
||||||
|
@ -277,4 +277,4 @@ class UpgradeConvergeOvercloud(UpgradePrepare):
|
||||||
|
|
||||||
forbidden_params = constants.UPGRADE_CONVERGE_FORBIDDEN_PARAMS
|
forbidden_params = constants.UPGRADE_CONVERGE_FORBIDDEN_PARAMS
|
||||||
|
|
||||||
log = logging.getLogger(__name__ + ".UpgradeConvergeOvercloud")
|
log = logging.getLogger(__name__ + ".UpgradeConverge")
|
||||||
|
|
Loading…
Reference in New Issue