From a181c8705a4730eebc35339c55e39ca7ff3bf90c Mon Sep 17 00:00:00 2001
From: John Kwiatkoski <jkwiatko@redhat.com>
Date: Wed, 23 Mar 2016 14:43:43 -0400
Subject: Tested of refactored code

---
 .../tasks/cleanup_logging.yaml                     | 47 ++++++++--------------
 1 file changed, 17 insertions(+), 30 deletions(-)

(limited to 'roles/openshift_hosted_logging/tasks/cleanup_logging.yaml')

diff --git a/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml b/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
index 23a514ffd..9d3ab3015 100644
--- a/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
+++ b/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
@@ -4,14 +4,9 @@
     command: oc get project logging
     register: logging_project
     failed_when: "'FAILED' in logging_project.stderr"
-    tags:
-      - cleanup
 
   - name: "Changing projects"
-    command: oc project logging
-    tags:
-      - cleanup
-      - build
+    command: "{{ openshift.common.client_binary }} project logging"
 
   - name: Create temp directory for kubeconfig
     command: mktemp -d /tmp/openshift-ansible-XXXXXX
@@ -25,52 +20,44 @@
 
   - name: "Changing projects"
     command: oc project logging
-    tags:
-      - cleanup
-      - build
 
 
   - name: "Cleanup any previous logging infrastructure"
-    command: oc delete --ignore-not-found all --selector logging-infra={{ item }}
+    command: "{{ openshift.common.client_binary }} delete --ignore-not-found all --selector logging-infra={{ item }}"
     with_items:
       - kibana
       - fluentd
       - elasticsearch
     ignore_errors: yes
-    tags:
-      - cleanup
-
 
   - name: "Cleanup existing support infrastructure"
-    command: oc delete --ignore-not-found all,sa,oauthclient --selector logging-infra=support
+    command: "{{ openshift.common.client_binary }} delete --ignore-not-found all,sa,oauthclient --selector logging-infra=support"
     ignore_errors: yes
-    tags:
-      - cleanup
 
   - name: "Cleanup existing secrets"
-    command: oc delete secret logging-fluentd logging-elasticsearch logging-es-proxy logging-kibana logging-kibana-proxy logging-kibana-ops-proxy
+    command: "{{ openshift.common.client_binary }} delete secret logging-fluentd logging-elasticsearch logging-es-proxy logging-kibana logging-kibana-proxy logging-kibana-ops-proxy"
     ignore_errors: yes
     register: clean_result
     failed_when: clean_result.rc == 1 and 'not found' not in clean_result.stderr
-    tags:
-      - cleanup
 
   - name: "Cleanup existing logging deployers"
-    command: oc delete pods --all
-    tags:
-      - cleanup
+    command: "{{ openshift.common.client_binary }} delete pods --all"
+
+
+  - name: "Cleanup logging project"
+    command: "{{ openshift.common.client_binary }} delete project logging"
 
-  - name: "Make sure to remove deployer template"
-    command: oc delete template logging-deployer-template -n openshift
+
+  - name: "Remove deployer template"
+    command: "{{ openshift.common.client_binary }} delete template logging-deployer-template -n openshift"
     register: delete_ouput
     failed_when: delete_ouput.rc == 1 and 'exists' not in delete_ouput.stderr
-    tags:
-      - cleanup
+
 
   - name: Delete temp directory
-  file:
-    name: "{{ mktemp.stdout }}"
-    state: absent
-  changed_when: False
+    file:
+      name: "{{ mktemp.stdout }}"
+      state: absent
+    changed_when: False
 
   - debug: msg="Success!"
-- 
cgit v1.2.3