summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-01-26 11:36:58 -0500
committerRussell Teague <rteague@redhat.com>2017-01-30 16:48:55 -0500
commitbc2ba98351a4b45a18813cf2dc2cd58f098bc1d3 (patch)
tree0787baf98e747bf740c6a167bc6ad8f6612492e4 /roles/openshift_facts
parentdb3718ef7107aeb010ebfd9d1493e94c8b302556 (diff)
downloadopenshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.tar.gz
openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.tar.bz2
openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.tar.xz
openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.zip
Create v3_5 upgrade playbooks
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 3c8e2ab9c..c7282d23d 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -867,6 +867,7 @@ def set_deployment_facts_if_unset(facts):
return facts
+# pylint: disable=too-many-statements
def set_version_facts_if_unset(facts):
""" Set version facts. This currently includes common.version and
common.version_gte_3_1_or_1_1.
@@ -904,8 +905,8 @@ def set_version_facts_if_unset(facts):
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 = True
- version_gte_3_4_or_1_4 = False
- version_gte_3_5_or_1_5 = False
+ version_gte_3_4_or_1_4 = True
+ version_gte_3_5_or_1_5 = True
version_gte_3_6_or_1_6 = 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
@@ -915,7 +916,9 @@ def set_version_facts_if_unset(facts):
facts['common']['version_gte_3_5_or_1_5'] = version_gte_3_5_or_1_5
facts['common']['version_gte_3_6_or_1_6'] = version_gte_3_6_or_1_6
- if version_gte_3_4_or_1_4:
+ if version_gte_3_5_or_1_5:
+ examples_content_version = 'v1.5'
+ elif version_gte_3_4_or_1_4:
examples_content_version = 'v1.4'
elif version_gte_3_3_or_1_3:
examples_content_version = 'v1.3'