Merge pull request #7148 from vrutkovs/quick-installer-update-versions

Quick installer: update supported version

utils/src/ooinstall/cli_installer.py

@@ -24,19 +24,6 @@ DEFAULT_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible.cfg'
 QUIET_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible-quiet.cfg'
 DEFAULT_PLAYBOOK_DIR = '/usr/share/ansible/openshift-ansible/'
 
-UPGRADE_MAPPINGS = {
-    '3.6': {
-        'minor_version': '3.6',
-        'minor_playbook': 'v3_6/upgrade.yml',
-        'major_playbook': 'v3_7/upgrade.yml',
-        'major_version': '3.7',
-    },
-    '3.7': {
-        'minor_version': '3.7',
-        'minor_playbook': 'v3_7/upgrade.yml',
-    },
-}
-
 
 def validate_ansible_dir(path):
     if not path:

utils/src/ooinstall/variants.py

@@ -39,18 +39,20 @@ class Variant(object):
 
 # WARNING: Keep the versions ordered, most recent first:
 OSE = Variant('openshift-enterprise', 'OpenShift Container Platform', [
-    Version('3.6', 'openshift-enterprise'),
+    Version('3.9', 'openshift-enterprise'),
 ])
 
 REG = Variant('openshift-enterprise', 'Registry', [
-    Version('3.6', 'openshift-enterprise', 'registry'),
+    Version('3.9', 'openshift-enterprise', 'registry'),
 ])
 
 origin = Variant('origin', 'OpenShift Origin', [
-    Version('3.6', 'origin'),
+    Version('3.9', 'origin'),
 ])
 
 LEGACY = Variant('openshift-enterprise', 'OpenShift Container Platform', [
+    Version('3.7', 'openshift-enterprise'),
+    Version('3.6', 'openshift-enterprise'),
     Version('3.5', 'openshift-enterprise'),
     Version('3.4', 'openshift-enterprise'),
     Version('3.3', 'openshift-enterprise'),