diff options
| author | Russell Teague <rteague@redhat.com> | 2017-01-31 08:05:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 08:05:03 -0500 |
| commit | fca215887b2e4224779b58e8fd1b7662ec993f83 (patch) | |
| tree | a8862a16c39d54dc5f123fff532904da371794e1 /roles/openshift_facts | |
| parent | e6bec56b75baa631cdb4902d29cca811db91e9f1 (diff) | |
| parent | bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3 (diff) | |
| download | openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.gz openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.bz2 openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.xz openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.zip | |
Merge pull request #3194 from mtnbikenc/upgrade-3_5-fork
Create v3_5 upgrade playbooks
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 9 |
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 0c7aad81e..60c564e5b 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' |