diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-10-22 10:37:17 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-10-22 10:37:17 -0400 |
| commit | d7c0c0eaff15315e7c57d196d08cc53f9ab200c5 (patch) | |
| tree | 5b1a3db396f883d95e85e6166c2ee757744ec419 /roles | |
| parent | 04d172ac4041c83857646f20eabbaf71a5e56673 (diff) | |
| parent | cc43b2ee85ed3f55529ac12107780aec414affee (diff) | |
| download | openshift-d7c0c0eaff15315e7c57d196d08cc53f9ab200c5.tar.gz openshift-d7c0c0eaff15315e7c57d196d08cc53f9ab200c5.tar.bz2 openshift-d7c0c0eaff15315e7c57d196d08cc53f9ab200c5.tar.xz openshift-d7c0c0eaff15315e7c57d196d08cc53f9ab200c5.zip | |
Merge pull request #678 from sdodson/examples
Adjust the logic as to when examples are deployed
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_examples/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_examples/tasks/main.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_examples/defaults/main.yml b/roles/openshift_examples/defaults/main.yml index 7d4f100e3..2043985ec 100644 --- a/roles/openshift_examples/defaults/main.yml +++ b/roles/openshift_examples/defaults/main.yml @@ -1,9 +1,9 @@ --- # By default install rhel and xpaas streams on enterprise installs -openshift_examples_load_centos: "{{ openshift_deployment_type != 'enterprise' }}" -openshift_examples_load_rhel: "{{ openshift_deployment_type == 'enterprise' }}" +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_db_templates: true -openshift_examples_load_xpaas: "{{ openshift_deployment_type == 'enterprise' }}" +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 diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index 3a829a4c6..ef98237cd 100644 --- a/roles/openshift_examples/tasks/main.yml +++ b/roles/openshift_examples/tasks/main.yml @@ -9,7 +9,7 @@ command: > {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ rhel_image_streams }} when: openshift_examples_load_rhel - register: oex_import_rhel_streams + register: oex_import_rhel_streams | bool failed_when: "'already exists' not in oex_import_rhel_streams.stderr and oex_import_rhel_streams.rc != 0" changed_when: false @@ -32,7 +32,7 @@ - name: Import quickstart-templates command: > {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ quickstarts_base }} - when: openshift_examples_load_quickstarts + when: openshift_examples_load_quickstarts | bool register: oex_import_quickstarts failed_when: "'already exists' not in oex_import_quickstarts.stderr and oex_import_quickstarts.rc != 0" changed_when: false |