diff options
| author | jcantrill <jcantril@redhat.com> | 2017-12-05 15:35:56 -0500 |
|---|---|---|
| committer | jcantrill <jcantril@redhat.com> | 2017-12-12 17:54:38 -0500 |
| commit | 86a74a9b64da1304588956e72dbd640ddcab508d (patch) | |
| tree | 54a12a11d6d20c20685cc36b65cc699dec0160bb /roles/openshift_logging/tasks/delete_logging.yaml | |
| parent | e2a6cde4f4e7d4a003950afc388f2cb60414c775 (diff) | |
| download | openshift-86a74a9b64da1304588956e72dbd640ddcab508d.tar.gz openshift-86a74a9b64da1304588956e72dbd640ddcab508d.tar.bz2 openshift-86a74a9b64da1304588956e72dbd640ddcab508d.tar.xz openshift-86a74a9b64da1304588956e72dbd640ddcab508d.zip | |
fix 1519808. Only annotate ops projects when openshift_logging_use_ops=true
Diffstat (limited to 'roles/openshift_logging/tasks/delete_logging.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index ffed956a4..af36d67c6 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/roles/openshift_logging/tasks/delete_logging.yaml @@ -107,6 +107,24 @@ - logging-fluentd - logging-mux +# remove annotations added by logging +- command: > + {{ openshift.common.client_binary }} + --config={{ openshift.common.config_base }}/master/admin.kubeconfig + get namespaces -o name {{ __default_logging_ops_projects | join(' ') }} + register: __logging_ops_projects + +- name: Remove Annotation of Operations Projects + command: > + {{ openshift.common.client_binary }} + --config={{ openshift.common.config_base }}/master/admin.kubeconfig + annotate {{ project }} openshift.io/logging.ui.hostname- + with_items: "{{ __logging_ops_projects.stdout_lines }}" + loop_control: + loop_var: project + when: + - __logging_ops_projects.stderr | length == 0 + ## EventRouter - include_role: name: openshift_logging_eventrouter |