diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-09 15:49:48 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-09 15:49:48 -0500 |
| commit | eeb164fae0e6721100c4fcc1717d92bb85b9652c (patch) | |
| tree | 70eee046db8012061c178ab4e686650048265564 /roles/openshift_examples/defaults | |
| parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
| parent | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (diff) | |
| download | openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.tar.gz openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.tar.bz2 openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.tar.xz openshift-eeb164fae0e6721100c4fcc1717d92bb85b9652c.zip | |
Merge pull request #1048 from twiest/prod
Sync master -> Prod
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" |