From 86a74a9b64da1304588956e72dbd640ddcab508d Mon Sep 17 00:00:00 2001 From: jcantrill Date: Tue, 5 Dec 2017 15:35:56 -0500 Subject: fix 1519808. Only annotate ops projects when openshift_logging_use_ops=true --- roles/openshift_logging/tasks/delete_logging.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'roles/openshift_logging/tasks/delete_logging.yaml') 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 -- cgit v1.2.1