From 6ebc87ff52b16621175a43607c380468593c6ea4 Mon Sep 17 00:00:00 2001
From: Wolfgang Kulhanek <wkulhanek@users.noreply.github.com>
Date: Fri, 06 Mar 2020 21:50:20 +0100
Subject: [PATCH] Another approach 1 (#1265)

---
 ansible/roles/ocp4-workload-quay-operator/tasks/workload.yml |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ansible/roles/ocp4-workload-quay-operator/tasks/workload.yml b/ansible/roles/ocp4-workload-quay-operator/tasks/workload.yml
index ecacc8a..661b6a1 100644
--- a/ansible/roles/ocp4-workload-quay-operator/tasks/workload.yml
+++ b/ansible/roles/ocp4-workload-quay-operator/tasks/workload.yml
@@ -169,8 +169,15 @@
     until: >-
       r_running_quay_pod.resources[0].status.containerStatuses[0].ready | bool
     ignore_errors: true
-    retries: 20
+    retries: 15
     delay: 5
+
+  - name: Delete crashing Pod to pick up SCC
+    when:
+    - not r_running_quay_pod.resources[0].status.containerStatuses[0].ready | bool
+    - r_running_quay_pod.resources[0].status.containerStatuses[0].state.waiting.reason is match("CrashLoopBackOff")
+      or r_running_quay_pod.resources[0].status.containerStatuses[0].state.waiting.reason is match("Error")
+    shell: "oc delete pod {{ r_running_quay_pod.resources[0].metadata.name }} -n {{ _quay_project }}"
 
   # - name: Restart crashing Pod to pick up SCC
   #   when:
@@ -183,18 +190,6 @@
   #     kind: Pod
   #     name: "{{ r_running_quay_pod.resources[0].metadata.name }}"
   #     namespace: "{{ _quay_project }}"
-
-  - name: Delete Quay Deployment to pick up SCC
-    when:
-    - not r_running_quay_pod.resources[0].status.containerStatuses[0].ready | bool
-    - r_running_quay_pod.resources[0].status.containerStatuses[0].state.waiting.reason is match("CrashLoopBackOff")
-      or r_running_quay_pod.resources[0].status.containerStatuses[0].state.waiting.reason is match("Error")
-    k8s:
-      state: absent
-      api_version: extensions/v1beta1
-      kind: Deployment
-      name: "{{ _quay_name }}-quay"
-      namespace: "{{ _quay_project }}"
 
 - name: Print Student as user.info
   debug:

--
Gitblit v1.9.3