Bump repo constants to support 4.0 RPMs

Smaller changes than previous releases.

playbooks/azure/openshift-cluster/group_vars/all/yum_repos.yml

@@ -40,9 +40,9 @@ azure_node_repos:
     sslclientkey: /var/lib/yum/client-key.pem
     enabled: yes
 
-  # TODO: Replace me post GA with https://mirror.openshift.com/libra/rhui-rhel-server-7-ose-3.11/
-  - name: rhel-server-7-ose-3.11
-    baseurl: https://mirror.openshift.com/enterprise/all/3.11/latest/x86_64/os
+  # TODO: Replace me post GA with https://mirror.openshift.com/libra/rhui-rhel-server-7-ose-4.0/
+  - name: rhel-server-7-ose-4.0
+    baseurl: https://mirror.openshift.com/enterprise/all/4.0/latest/x86_64/os
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
     # TODO: Remove me post GA
     gpgcheck: false

roles/lib_utils/lookup_plugins/openshift_master_facts_default_predicates.py

@@ -27,11 +27,11 @@ class LookupModule(LookupBase):
                 # pylint: disable=line-too-long
                 raise AnsibleError("Either OpenShift needs to be installed or openshift_release needs to be specified")
 
-        if short_version not in ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'latest']:
+        if short_version not in ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '4.0', '4.1', '4.2', 'latest']:
             raise AnsibleError("Unknown short_version %s" % short_version)
 
         if short_version == 'latest':
-            short_version = '3.11'
+            short_version = '4.0'
 
         # Predicates ordered according to OpenShift Origin source:
         # origin/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
@@ -64,7 +64,7 @@ class LookupModule(LookupBase):
                 {'name': 'NoVolumeNodeConflict'},
             ])
 
-        if short_version in ['3.9', '3.10', '3.11']:
+        if short_version in ['3.9', '3.10', '3.11', '4.0', '4.1', '4.2']:
             predicates.extend([
                 {'name': 'NoVolumeZoneConflict'},
                 {'name': 'MaxEBSVolumeCount'},

roles/lib_utils/lookup_plugins/openshift_master_facts_default_priorities.py

@@ -27,13 +27,13 @@ class LookupModule(LookupBase):
                 # pylint: disable=line-too-long
                 raise AnsibleError("Either OpenShift needs to be installed or openshift_release needs to be specified")
 
-        if short_version not in ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'latest']:
+        if short_version not in ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '4.0', '4.1', '4.2', 'latest']:
             raise AnsibleError("Unknown short_version %s" % short_version)
 
         if short_version == 'latest':
-            short_version = '3.11'
+            short_version = '4.0'
 
-        if short_version in ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']:
+        if short_version in ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '4.0', '4.1', '4.2']:
             priorities.extend([
                 {'name': 'SelectorSpreadPriority', 'weight': 1},
                 {'name': 'InterPodAffinityPriority', 'weight': 1},

roles/lib_utils/test/openshift_master_facts_default_predicates_tests.py

@@ -46,7 +46,7 @@ DEFAULT_PREDICATES_3_9 = [
     {'name': 'CheckVolumeBinding'},
 ]
 
-DEFAULT_PREDICATES_3_11 = DEFAULT_PREDICATES_3_10 = DEFAULT_PREDICATES_3_9
+DEFAULT_PREDICATES_4_0 = DEFAULT_PREDICATES_3_11 = DEFAULT_PREDICATES_3_10 = DEFAULT_PREDICATES_3_9
 
 REGION_PREDICATE = {
     'name': 'Region',
@@ -64,6 +64,7 @@ TEST_VARS = [
     ('3.9', DEFAULT_PREDICATES_3_9),
     ('3.10', DEFAULT_PREDICATES_3_10),
     ('3.11', DEFAULT_PREDICATES_3_11),
+    ('4.0', DEFAULT_PREDICATES_4_0),
 ]
 
 

roles/lib_utils/test/openshift_master_facts_default_priorities_tests.py

@@ -11,7 +11,7 @@ DEFAULT_PRIORITIES_3_6 = [
     {'name': 'TaintTolerationPriority', 'weight': 1}
 ]
 DEFAULT_PRIORITIES_3_8 = DEFAULT_PRIORITIES_3_7 = DEFAULT_PRIORITIES_3_6
-DEFAULT_PRIORITIES_3_11 = DEFAULT_PRIORITIES_3_10 = DEFAULT_PRIORITIES_3_9 = DEFAULT_PRIORITIES_3_8
+DEFAULT_PRIORITIES_4_0 = DEFAULT_PRIORITIES_3_11 = DEFAULT_PRIORITIES_3_10 = DEFAULT_PRIORITIES_3_9 = DEFAULT_PRIORITIES_3_8
 
 ZONE_PRIORITY = {
     'name': 'Zone',
@@ -30,6 +30,7 @@ TEST_VARS = [
     ('3.9', DEFAULT_PRIORITIES_3_9),
     ('3.10', DEFAULT_PRIORITIES_3_10),
     ('3.11', DEFAULT_PRIORITIES_3_11),
+    ('4.0', DEFAULT_PRIORITIES_4_0),
 ]
 
 

roles/openshift_console/defaults/main.yml

@@ -23,6 +23,6 @@ l_openshift_console_branding_dict:
 openshift_console_branding: "{{ l_openshift_console_branding_dict[openshift_deployment_type] }}"
 
 l_openshift_console_documentation_url_dict:
-  origin: 'https://docs.okd.io/3.11/'
-  openshift-enterprise: 'https://docs.openshift.com/container-platform/3.11/'
+  origin: 'https://docs.okd.io/4.0/'
+  openshift-enterprise: 'https://docs.openshift.com/container-platform/4.0/'
 openshift_console_documentation_base_url: "{{ l_openshift_console_documentation_url_dict[openshift_deployment_type] }}"

roles/openshift_version/defaults/main.yml

@@ -1,3 +1,3 @@
 ---
 openshift_protect_installed_version: True
-openshift_release: '3.11'
+openshift_release: '4.0'