Rename VERSIONS to UPGRADE_LEVELS
This variable was renamed with more appropriate name to not confuse people. Change-Id: I444a2f44a8d8b2ed6538c397482191a7a2d4f65c Related-Bug: #1625083
This commit is contained in:
parent
413c6b03a8
commit
6d470c338e
|
@ -56,7 +56,7 @@ class ComputeUpgrade(upgrade.UpgradeHandler):
|
||||||
controller, False)
|
controller, False)
|
||||||
|
|
||||||
seed_version = self.env.data["fuel_version"]
|
seed_version = self.env.data["fuel_version"]
|
||||||
openstack_release = magic_consts.VERSIONS[seed_version]
|
openstack_release = magic_consts.UPGRADE_LEVELS[seed_version]
|
||||||
node_util.add_compute_upgrade_levels(self.node, openstack_release)
|
node_util.add_compute_upgrade_levels(self.node, openstack_release)
|
||||||
|
|
||||||
ssh.call(["service", "nova-compute", "restart"], node=self.node)
|
ssh.call(["service", "nova-compute", "restart"], node=self.node)
|
||||||
|
|
|
@ -63,7 +63,7 @@ class ControllerUpgrade(upgrade.UpgradeHandler):
|
||||||
|
|
||||||
def postdeploy(self):
|
def postdeploy(self):
|
||||||
seed_version = self.env.data["fuel_version"]
|
seed_version = self.env.data["fuel_version"]
|
||||||
openstack_release = magic_consts.VERSIONS[seed_version]
|
openstack_release = magic_consts.UPGRADE_LEVELS[seed_version]
|
||||||
node_util.add_compute_upgrade_levels(self.node, openstack_release)
|
node_util.add_compute_upgrade_levels(self.node, openstack_release)
|
||||||
|
|
||||||
node_util.restart_nova_services(self.node)
|
node_util.restart_nova_services(self.node)
|
||||||
|
|
|
@ -37,7 +37,9 @@ BRIDGES = ['br-ex', 'br-mgmt']
|
||||||
DEFAULT_DISKS = True
|
DEFAULT_DISKS = True
|
||||||
DEFAULT_NETS = True
|
DEFAULT_NETS = True
|
||||||
ISCSI_CONFIG_PATH = "/etc/iscsi/initiatorname.iscsi"
|
ISCSI_CONFIG_PATH = "/etc/iscsi/initiatorname.iscsi"
|
||||||
VERSIONS = {
|
# NOTE(akscram): This mapping contains environments versions and
|
||||||
|
# suitable upgrade_levels to support N+1 upgrades for Nova services.
|
||||||
|
UPGRADE_LEVELS = {
|
||||||
'9.0': 'liberty',
|
'9.0': 'liberty',
|
||||||
'8.0': 'kilo',
|
'8.0': 'kilo',
|
||||||
'7.0': 'juno',
|
'7.0': 'juno',
|
||||||
|
|
Loading…
Reference in New Issue