Browse Source

Rename VERSIONS to UPGRADE_LEVELS

This variable was renamed with more appropriate name to not confuse
people.

Change-Id: I444a2f44a8d8b2ed6538c397482191a7a2d4f65c
Related-Bug: #1625083
Ilya Kharin 2 years ago
parent
commit
6d470c338e

+ 1
- 1
octane/handlers/upgrade/compute.py View File

@@ -56,7 +56,7 @@ class ComputeUpgrade(upgrade.UpgradeHandler):
56 56
                 controller, False)
57 57
 
58 58
         seed_version = self.env.data["fuel_version"]
59
-        openstack_release = magic_consts.VERSIONS[seed_version]
59
+        openstack_release = magic_consts.UPGRADE_LEVELS[seed_version]
60 60
         node_util.add_compute_upgrade_levels(self.node, openstack_release)
61 61
 
62 62
         ssh.call(["service", "nova-compute", "restart"], node=self.node)

+ 1
- 1
octane/handlers/upgrade/controller.py View File

@@ -63,7 +63,7 @@ class ControllerUpgrade(upgrade.UpgradeHandler):
63 63
 
64 64
     def postdeploy(self):
65 65
         seed_version = self.env.data["fuel_version"]
66
-        openstack_release = magic_consts.VERSIONS[seed_version]
66
+        openstack_release = magic_consts.UPGRADE_LEVELS[seed_version]
67 67
         node_util.add_compute_upgrade_levels(self.node, openstack_release)
68 68
 
69 69
         node_util.restart_nova_services(self.node)

+ 3
- 1
octane/magic_consts.py View File

@@ -37,7 +37,9 @@ BRIDGES = ['br-ex', 'br-mgmt']
37 37
 DEFAULT_DISKS = True
38 38
 DEFAULT_NETS = True
39 39
 ISCSI_CONFIG_PATH = "/etc/iscsi/initiatorname.iscsi"
40
-VERSIONS = {
40
+# NOTE(akscram): This mapping contains environments versions and
41
+# suitable upgrade_levels to support N+1 upgrades for Nova services.
42
+UPGRADE_LEVELS = {
41 43
     '9.0': 'liberty',
42 44
     '8.0': 'kilo',
43 45
     '7.0': 'juno',

Loading…
Cancel
Save