summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2016-06-03 20:31:44 -0600
committerRich Megginson <rmeggins@redhat.com>2016-07-22 15:37:15 -0600
commit3e74a0846e3fb18a4d553bc4a30f3c73a0e98cc0 (patch)
tree571fd53bcab125451fb16712c58bff75c8de76fc
parenta4f84c1d6818b0f4bfe91f1efffb957ca70c2250 (diff)
downloadopenshift-3e74a0846e3fb18a4d553bc4a30f3c73a0e98cc0.tar.gz
openshift-3e74a0846e3fb18a4d553bc4a30f3c73a0e98cc0.tar.bz2
openshift-3e74a0846e3fb18a4d553bc4a30f3c73a0e98cc0.tar.xz
openshift-3e74a0846e3fb18a4d553bc4a30f3c73a0e98cc0.zip
skip if the objects already exist
-rw-r--r--roles/openshift_hosted_logging/tasks/deploy_logging.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml
index 73f92021b..f19ce3e2b 100644
--- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml
+++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml
@@ -73,6 +73,8 @@
- name: "Process the deployer template"
shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig process logging-deployer-template -v {{ oc_process_values }} | {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig create -f -"
+ register: process_deployer
+ failed_when: process_deployer.rc == 1 and 'already exists' not in process_deployer.stderr
- name: "Wait for image pull and deployer pod"
shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get pods | grep logging-deployer.*Completed"
@@ -83,6 +85,8 @@
- name: "Process support template"
shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig process logging-support-template | {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig create -f -"
+ register: process_support
+ failed_when: process_support.rc == 1 and 'already exists' not in process_support.stderr
- name: "Set insecured registry"
command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig annotate is --all openshift.io/image.insecureRepository=true --overwrite"