Bläddra i källkod

Merge pull request #2713 from smunilla/BZ1384291

Update quick installer upgrade mappings for 3.4
Scott Dodson 8 år sedan
förälder
incheckning
17c3d6236a
1 ändrade filer med 12 tillägg och 0 borttagningar
  1. 12 0
      utils/src/ooinstall/cli_installer.py

+ 12 - 0
utils/src/ooinstall/cli_installer.py

@@ -43,6 +43,16 @@ UPGRADE_MAPPINGS = {
         'major_playbook': 'v3_3/upgrade.yml',
         'major_version': '3.3',
     },
+    '3.3': {
+        'minor_version': '3.3',
+        'minor_playbook': 'v3_3/upgrade.yml',
+        'major_playbook': 'v3_4/upgrade.yml',
+        'major_version': '3.4',
+    },
+    '3.4': {
+        'minor_version': '3.4',
+        'minor_playbook': 'v3_4/upgrade.yml',
+    },
 }
 
 
@@ -306,6 +316,7 @@ hostname.
     else:
         return None
 
+
 def set_cluster_hostname(oo_cfg):
     message = """
 You have chosen to install a single master cluster (non-HA).
@@ -321,6 +332,7 @@ If you want to override the cluster host name now to something other than the de
                                     default='')
     oo_cfg.deployment.variables['openshift_master_cluster_hostname'] = cluster_hostname
 
+
 def collect_storage_host(hosts):
     """
     Get a valid host for storage from the user and append it to the list of