diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-29 17:04:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 17:04:05 -0400 |
| commit | 6f6649620d9eae28548bf2cbe93af24cfdd8e428 (patch) | |
| tree | 05123317f64083a01724fe27aa7ba9088469a9aa /roles/openshift_examples/tasks | |
| parent | c70525677eed8818602d2a6db080e009689c0ca3 (diff) | |
| parent | c244dd767f1185fd0b3da9c32f639aab91489c0e (diff) | |
| download | openshift-6f6649620d9eae28548bf2cbe93af24cfdd8e428.tar.gz openshift-6f6649620d9eae28548bf2cbe93af24cfdd8e428.tar.bz2 openshift-6f6649620d9eae28548bf2cbe93af24cfdd8e428.tar.xz openshift-6f6649620d9eae28548bf2cbe93af24cfdd8e428.zip | |
Merge pull request #2237 from sdodson/dot-net
Add dotnet image stream to enterprise installs
Diffstat (limited to 'roles/openshift_examples/tasks')
| -rw-r--r-- | roles/openshift_examples/tasks/main.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index d80e7f086..4150fabec 100644 --- a/roles/openshift_examples/tasks/main.yml +++ b/roles/openshift_examples/tasks/main.yml @@ -49,8 +49,10 @@ # RHEL and Centos image streams are mutually exclusive - name: Import RHEL streams command: > - {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ rhel_image_streams }} + {{ openshift.common.client_binary }} {{ openshift_examples_import_command }} -n openshift -f {{ item }} when: openshift_examples_load_rhel | bool + with_items: + - "{{ rhel_image_streams }}" register: oex_import_rhel_streams failed_when: "'already exists' not in oex_import_rhel_streams.stderr and oex_import_rhel_streams.rc != 0" changed_when: false @@ -100,12 +102,15 @@ path: "{{ item }}" state: absent with_items: - - "{{ xpaas_templates }}/sso70-basic.json" + - "{{ xpaas_templates_base }}/sso70-basic.json" - name: Remove old xPaas templates from openshift namespace - command: oc delete -n openshift {{ item }} + command: "{{ openshift.common.client_binary }} -n openshift delete templates/{{ item }}" with_items: - sso70-basic + register: oex_delete_old_xpaas_templates + failed_when: "'not found' not in oex_delete_old_xpaas_templates.stderr and oex_delete_old_xpaas_templates.rc != 0" + changed_when: false - name: Import xPaas image streams command: > |