diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-19 18:46:48 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-19 18:46:48 -0500 |
| commit | c473a90f4abe887a1a94819e2feac8dcd29dc839 (patch) | |
| tree | 9c736326cf4b76e119174d3374c0c63f62d72176 /roles/openshift_examples/defaults | |
| parent | fabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff) | |
| parent | 48778f29f265380a3e6fa2e882621ebc3781736b (diff) | |
| download | openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.gz openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.bz2 openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.xz openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.zip | |
Merge pull request #808 from sdodson/containers
Containerized install with SDN support
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 0bc5d7750..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: "/usr/share/openshift/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" |