From d98377cdce21fe1f258d8bd1b4ac1e0cf1d19555 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Wed, 2 Mar 2016 14:12:30 -0500 Subject: Adding support for v1.2 examples --- roles/openshift_examples/defaults/main.yml | 2 +- roles/openshift_facts/library/openshift_facts.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml index 5e955590e..ad21d0f09 100644 --- a/roles/openshift_examples/defaults/main.yml +++ b/roles/openshift_examples/defaults/main.yml @@ -6,7 +6,7 @@ openshift_examples_load_db_templates: true openshift_examples_load_xpaas: "{{ openshift_deployment_type != 'origin' }}" openshift_examples_load_quickstarts: true -content_version: "{{ 'v1.1' if openshift.common.version_gte_3_1_or_1_1 else 'v1.0' }}" +content_version: "{{ openshift.common.examples_content_version }}" examples_base: "{{ openshift.common.config_base if openshift.common.is_containerized else '/usr/share/openshift' }}/examples" image_streams_base: "{{ examples_base }}/image-streams" diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 349b50976..71e3284af 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -731,6 +731,15 @@ def set_version_facts_if_unset(facts): 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 + if 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' + else: + examples_content_version = 'v1.0' + + facts['common']['examples_content_version'] = examples_content_version + return facts def set_manageiq_facts_if_unset(facts): -- cgit v1.2.3