From 3391066d5b5c5a981ee6f0a375b55bd94d42c7fd Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 29 Jul 2016 12:54:35 -0400 Subject: Add dotnet image stream to enterprise installs --- roles/openshift_examples/tasks/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'roles/openshift_examples/tasks') diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index d80e7f086..86148784f 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 -- cgit v1.2.3 From c244dd767f1185fd0b3da9c32f639aab91489c0e Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 29 Jul 2016 14:00:57 -0400 Subject: Fix xpaas_templates_base --- roles/openshift_examples/tasks/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'roles/openshift_examples/tasks') diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml index 86148784f..4150fabec 100644 --- a/roles/openshift_examples/tasks/main.yml +++ b/roles/openshift_examples/tasks/main.yml @@ -102,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: > -- cgit v1.2.3