summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_hosted_logging/tasks/cleanup_logging.yaml')
-rw-r--r--roles/openshift_hosted_logging/tasks/cleanup_logging.yaml28
1 files changed, 12 insertions, 16 deletions
diff --git a/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml b/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
index 9d3ab3015..8331f0389 100644
--- a/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
+++ b/roles/openshift_hosted_logging/tasks/cleanup_logging.yaml
@@ -1,13 +1,4 @@
---
-
- - name: "Checking for logging project"
- command: oc get project logging
- register: logging_project
- failed_when: "'FAILED' in logging_project.stderr"
-
- - name: "Changing projects"
- command: "{{ openshift.common.client_binary }} project logging"
-
- name: Create temp directory for kubeconfig
command: mktemp -d /tmp/openshift-ansible-XXXXXX
register: mktemp
@@ -18,12 +9,17 @@
cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ mktemp.stdout }}/admin.kubeconfig
changed_when: False
+ - name: "Checking for logging project"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get project logging"
+ register: logging_project
+ failed_when: "'FAILED' in logging_project.stderr"
+
- name: "Changing projects"
- command: oc project logging
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig project logging"
- name: "Cleanup any previous logging infrastructure"
- command: "{{ openshift.common.client_binary }} delete --ignore-not-found all --selector logging-infra={{ item }}"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig delete --ignore-not-found all --selector logging-infra={{ item }}"
with_items:
- kibana
- fluentd
@@ -31,25 +27,25 @@
ignore_errors: yes
- name: "Cleanup existing support infrastructure"
- command: "{{ openshift.common.client_binary }} delete --ignore-not-found all,sa,oauthclient --selector logging-infra=support"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig delete --ignore-not-found all,sa,oauthclient --selector logging-infra=support"
ignore_errors: yes
- name: "Cleanup existing secrets"
- command: "{{ openshift.common.client_binary }} delete secret logging-fluentd logging-elasticsearch logging-es-proxy logging-kibana logging-kibana-proxy logging-kibana-ops-proxy"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig 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
- name: "Cleanup existing logging deployers"
- command: "{{ openshift.common.client_binary }} delete pods --all"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig delete pods --all"
- name: "Cleanup logging project"
- command: "{{ openshift.common.client_binary }} delete project logging"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig delete project logging"
- name: "Remove deployer template"
- command: "{{ openshift.common.client_binary }} delete template logging-deployer-template -n openshift"
+ command: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig delete template logging-deployer-template -n openshift"
register: delete_ouput
failed_when: delete_ouput.rc == 1 and 'exists' not in delete_ouput.stderr