diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-12-13 16:59:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 16:59:32 -0500 |
commit | 34f248849d0963403f7939d5b229381374d025a7 (patch) | |
tree | 684b0d044a40283f19a476a988177c257bc14a84 /roles/openshift_logging/tasks/delete_logging.yaml | |
parent | f22cd5d64bf3ca18f91a564545e5bd916dc56764 (diff) | |
parent | 86a74a9b64da1304588956e72dbd640ddcab508d (diff) | |
download | openshift-34f248849d0963403f7939d5b229381374d025a7.tar.gz openshift-34f248849d0963403f7939d5b229381374d025a7.tar.bz2 openshift-34f248849d0963403f7939d5b229381374d025a7.tar.xz openshift-34f248849d0963403f7939d5b229381374d025a7.zip |
Merge pull request #6363 from jcantrill/bz1519808_logging_kibana_annotation
fix 1519808. Only annotate ops projects when openshift_logging_use_op…
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 |