From f14ec41fc954e2f1e2d5ec0505d6198f768926a0 Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Fri, 25 Aug 2017 09:00:10 -0400
Subject: annotate the infra projects for logging to fix bz1480988

---
 .../openshift_logging/tasks/annotate_ops_projects.yaml  | 17 +++++++++++++++++
 roles/openshift_logging/tasks/install_logging.yaml      |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 roles/openshift_logging/tasks/annotate_ops_projects.yaml

(limited to 'roles/openshift_logging/tasks')

diff --git a/roles/openshift_logging/tasks/annotate_ops_projects.yaml b/roles/openshift_logging/tasks/annotate_ops_projects.yaml
new file mode 100644
index 000000000..d4b33616a
--- /dev/null
+++ b/roles/openshift_logging/tasks/annotate_ops_projects.yaml
@@ -0,0 +1,17 @@
+---
+- oc_obj:
+    state: list
+    kind: project
+    name: "{{ item }}"
+  with_items: "{{ __default_logging_ops_projects }}"
+  register: __logging_ops_projects
+
+- name: Annotate Operations Projects
+  oc_edit:
+    kind: ns
+    name: "{{ item.item }}"
+    separator: '#'
+    content:
+      metadata#annotations#openshift.io/logging.ui.hostname: "{{ openshift_logging_kibana_ops_hostname }}"
+  with_items: "{{ __logging_ops_projects.results }}"
+  when: "{{ item.results.stderr is not defined }}"
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index d4a305fb8..654a7ce3e 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -220,6 +220,7 @@
   when:
   - openshift_logging_use_ops | bool
 
+- include: annotate_ops_projects.yaml
 
 ## Curator
 - include_role:
-- 
cgit v1.2.1