summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-10 10:14:58 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-10 10:14:58 -0500
commit6f4aeb1039df339e8a4e1500920e078f09c944a3 (patch)
treef1783601e7d455254c9a12211f1d549eb208f1f0 /roles/openshift_examples
parenta0701fd2d6401acf7dc9eb8c1e711d66b83dc554 (diff)
parent3e80073b3b9052bedda3850c7844bef50f489ef0 (diff)
downloadopenshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.gz
openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.bz2
openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.xz
openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.zip
Merge pull request #1368 from detiber/gte3_2
Add gte check for 3.2, update version checks to gte
Diffstat (limited to 'roles/openshift_examples')
-rw-r--r--roles/openshift_examples/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml
index 6b9964aec..5e955590e 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_greater_than_3_1_or_1_1 else 'v1.0' }}"
+content_version: "{{ 'v1.1' if openshift.common.version_gte_3_1_or_1_1 else 'v1.0' }}"
examples_base: "{{ openshift.common.config_base if openshift.common.is_containerized else '/usr/share/openshift' }}/examples"
image_streams_base: "{{ examples_base }}/image-streams"