Browse Source

Add gte_3_3

Scott Dodson 8 years ago
parent
commit
908b43cea6

+ 1 - 1
roles/openshift_examples/defaults/main.yml

@@ -21,4 +21,4 @@ infrastructure_enterprise_base: "{{ examples_base }}/infrastructure-templates/en
 
 openshift_examples_import_command: "create"
 registry_url: ""
-registry_host: "{{ registry_url.split('/')[0] if '.' in registry_url.split('/')[0] else '' }}"
+registry_host: "{{ registry_url.split('/')[0] if '.' in registry_url.split('/')[0] else '' }}"

+ 8 - 1
roles/openshift_facts/library/openshift_facts.py

@@ -832,19 +832,26 @@ def set_version_facts_if_unset(facts):
                 version_gte_3_1_or_1_1 = LooseVersion(version) >= LooseVersion('1.1.0')
                 version_gte_3_1_1_or_1_1_1 = LooseVersion(version) >= LooseVersion('1.1.1')
                 version_gte_3_2_or_1_2 = LooseVersion(version) >= LooseVersion('1.2.0')
+                version_gte_3_3_or_1_3 = LooseVersion(version) >= LooseVersion('1.3.0')
             else:
                 version_gte_3_1_or_1_1 = LooseVersion(version) >= LooseVersion('3.0.2.905')
                 version_gte_3_1_1_or_1_1_1 = LooseVersion(version) >= LooseVersion('3.1.1')
                 version_gte_3_2_or_1_2 = LooseVersion(version) >= LooseVersion('3.1.1.901')
+                version_gte_3_3_or_1_3 = LooseVersion(version) >= LooseVersion('3.3.0')
         else:
             version_gte_3_1_or_1_1 = True
             version_gte_3_1_1_or_1_1_1 = True
             version_gte_3_2_or_1_2 = True
+            version_gte_3_3_or_1_3 = False
         facts['common']['version_gte_3_1_or_1_1'] = version_gte_3_1_or_1_1
         facts['common']['version_gte_3_1_1_or_1_1_1'] = version_gte_3_1_1_or_1_1_1
         facts['common']['version_gte_3_2_or_1_2'] = version_gte_3_2_or_1_2
+        facts['common']['version_gte_3_3_or_1_3'] = version_gte_3_3_or_1_3
 
-        if version_gte_3_2_or_1_2:
+
+        if version_gte_3_3_or_1_3:
+            examples_content_version = 'v1.3'
+        elif version_gte_3_2_or_1_2:
             examples_content_version = 'v1.2'
         elif version_gte_3_1_or_1_1:
             examples_content_version = 'v1.1'