diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-20 15:45:39 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-12-15 15:45:45 -0500 |
| commit | 043d6b3a7e3c6b799ddf4157ccdf2b2b67451d81 (patch) | |
| tree | 7fdcdd862d1d959702054a40b8990bfaf8e4be34 /roles/openshift_examples/defaults | |
| parent | 8e7c5c970b8adc83fd6d5cad115f4edb06b36d98 (diff) | |
| download | openshift-043d6b3a7e3c6b799ddf4157ccdf2b2b67451d81.tar.gz openshift-043d6b3a7e3c6b799ddf4157ccdf2b2b67451d81.tar.bz2 openshift-043d6b3a7e3c6b799ddf4157ccdf2b2b67451d81.tar.xz openshift-043d6b3a7e3c6b799ddf4157ccdf2b2b67451d81.zip | |
fixes
Diffstat (limited to 'roles/openshift_examples/defaults')
| -rw-r--r-- | roles/openshift_examples/defaults/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml index d318d17e3..e27f4e0a6 100644 --- a/roles/openshift_examples/defaults/main.yml +++ b/roles/openshift_examples/defaults/main.yml @@ -1,14 +1,14 @@ --- # By default install rhel and xpaas streams on enterprise installs -openshift_examples_load_centos: "{{ openshift_deployment_type not in ['enterprise','openshift-enterprise','atomic-enterprise','online'] }}" -openshift_examples_load_rhel: "{{ openshift_deployment_type in ['enterprise','openshift-enterprise','atomic-enterprise','online'] }}" +openshift_examples_load_centos: "{{ openshift_deployment_type == 'origin' }}" +openshift_examples_load_rhel: "{{ openshift_deployment_type != 'origin' }}" openshift_examples_load_db_templates: true -openshift_examples_load_xpaas: "{{ openshift_deployment_type in ['enterprise','openshift-enterprise','atomic-enterprise','online'] }}" +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' }}" -examples_base: "{% if openshift.common.is_atomic %}{{ openshift.common.config_base }}{% else %}/usr/share/openshift{% endif %}/examples" +examples_base: "{{ openshift.common.config_base if openshift.common.is_containerized else '/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" |