diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-02-11 10:32:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-11 10:32:29 +0100 |
| commit | 3921f01be97ccfbb54e11666ce3647774c3fdbb9 (patch) | |
| tree | fb49743460566722c42b30ec297f2f4e19d4a1eb /roles/openshift_logging | |
| parent | 5444c0f474f3701f22ae8392d1ac192403c8b5b7 (diff) | |
| parent | badaa6dc09abfcbfb2770a2d2070c803a2aaaf03 (diff) | |
| download | openshift-3921f01be97ccfbb54e11666ce3647774c3fdbb9.tar.gz openshift-3921f01be97ccfbb54e11666ce3647774c3fdbb9.tar.bz2 openshift-3921f01be97ccfbb54e11666ce3647774c3fdbb9.tar.xz openshift-3921f01be97ccfbb54e11666ce3647774c3fdbb9.zip | |
Merge pull request #3321 from ashcrow/oc-serviceaccount-module
WIP: oc serviceaccount now done via oc_serviceaccount module
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 10 |
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 |