diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-20 13:18:50 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-20 13:18:50 -0500 |
| commit | ca2e6af84b5d3f5239302348011b053c596a6ac6 (patch) | |
| tree | 24bc02302fbe8d5a09c5ba3c66daacd784890151 /roles/openshift_examples/defaults | |
| parent | 24f21d3115a1b25b93acef1d80509347117454c2 (diff) | |
| parent | cef52c3a1aabb10be8c1d4b81f37464982832105 (diff) | |
| download | openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.tar.gz openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.tar.bz2 openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.tar.xz openshift-ca2e6af84b5d3f5239302348011b053c596a6ac6.zip | |
Merge pull request #929 from sdodson/fix-30-imagestreams
Install version dependent image streams for v1.0 and v1.1
Diffstat (limited to 'roles/openshift_examples/defaults')
| -rw-r--r-- | roles/openshift_examples/defaults/main.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml index 8e8bc6868..0bc5d7750 100644 --- a/roles/openshift_examples/defaults/main.yml +++ b/roles/openshift_examples/defaults/main.yml @@ -6,7 +6,9 @@ openshift_examples_load_db_templates: true openshift_examples_load_xpaas: "{{ openshift_deployment_type in ['enterprise','openshift-enterprise','atomic-enterprise','online'] }}" openshift_examples_load_quickstarts: true -examples_base: /usr/share/openshift/examples +content_version: "{{ 'v1.1' if openshift.common.version_greater_than_3_1_or_1_1 else 'v1.0' }}" + +examples_base: "/usr/share/openshift/examples" image_streams_base: "{{ examples_base }}/image-streams" centos_image_streams: "{{ image_streams_base}}/image-streams-centos7.json" rhel_image_streams: "{{ image_streams_base}}/image-streams-rhel7.json" |