summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-02-09 11:57:57 -0500
committerSteve Milner <smilner@redhat.com>2017-02-10 12:52:36 -0500
commitbadaa6dc09abfcbfb2770a2d2070c803a2aaaf03 (patch)
treee78d40748a2e1237e6fc9cfc2bede800d7f7c6b0 /roles/openshift_logging/tasks
parent07ca54fe406a533e70350aa9273d5a3df297f156 (diff)
downloadopenshift-badaa6dc09abfcbfb2770a2d2070c803a2aaaf03.tar.gz
openshift-badaa6dc09abfcbfb2770a2d2070c803a2aaaf03.tar.bz2
openshift-badaa6dc09abfcbfb2770a2d2070c803a2aaaf03.tar.xz
openshift-badaa6dc09abfcbfb2770a2d2070c803a2aaaf03.zip
oc serviceaccount now done via oc_serviceaccount module
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/delete_logging.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml
index 908f3ee88..9621d0d1a 100644
--- a/roles/openshift_logging/tasks/delete_logging.yaml
+++ b/roles/openshift_logging/tasks/delete_logging.yaml
@@ -80,16 +80,16 @@
# delete our service accounts
- name: delete service accounts
- command: >
- {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
- delete serviceaccount {{ item }} -n {{ openshift_logging_namespace }} --ignore-not-found=true
+ oc_serviceaccount:
+ kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
+ name: "{{ item }}"
+ namespace: "{{ openshift_logging_namespace }}"
+ state: absent
with_items:
- aggregated-logging-elasticsearch
- aggregated-logging-kibana
- aggregated-logging-curator
- aggregated-logging-fluentd
- register: delete_result
- changed_when: delete_result.stdout.find("deleted") != -1 and delete_result.rc == 0
# delete our roles
- name: delete roles