diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-04 14:28:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 14:28:08 -0500 |
| commit | 76be31cf7eeb633cbca6e77b8d5b976826ac0b4e (patch) | |
| tree | b52b93d95cd99bc51ab762a902a1c9d01e067186 /roles/openshift_facts | |
| parent | 86a6eacce8ba754853e0f7fa12059c33e3562962 (diff) | |
| parent | 26389420421d7297c2e657d99469d94f0c05d163 (diff) | |
| download | openshift-76be31cf7eeb633cbca6e77b8d5b976826ac0b4e.tar.gz openshift-76be31cf7eeb633cbca6e77b8d5b976826ac0b4e.tar.bz2 openshift-76be31cf7eeb633cbca6e77b8d5b976826ac0b4e.tar.xz openshift-76be31cf7eeb633cbca6e77b8d5b976826ac0b4e.zip | |
Merge pull request #3832 from jarrpa/content-version
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index e1f4c4e6d..7edf141e5 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -936,7 +936,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_5_or_1_5: + if version_gte_3_6_or_1_6: + examples_content_version = 'v1.6' + elif 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' |