From 60ad4626f03cbfb119290a4bfaf9ecba53dc762b Mon Sep 17 00:00:00 2001
From: ewolinetz <ewolinet@redhat.com>
Date: Tue, 2 May 2017 11:21:56 -0500
Subject: Pulling in changes from master

---
 roles/openshift_logging_kibana/tasks/main.yaml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_logging_kibana')

diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml
index a8ab3f4ef..3bc903181 100644
--- a/roles/openshift_logging_kibana/tasks/main.yaml
+++ b/roles/openshift_logging_kibana/tasks/main.yaml
@@ -41,7 +41,9 @@
   when:
   - openshift_logging_image_pull_secret == ''
 
-- set_fact: kibana_name="{{ 'logging-kibana' ~ ( (openshift_logging_kibana_ops_deployment | default(false) | bool) | ternary('-ops', '')) }}"
+- set_fact:
+    kibana_name: "{{ 'logging-kibana' ~ ( (openshift_logging_kibana_ops_deployment | default(false) | bool) | ternary('-ops', '')) }}"
+    kibana_component: "{{ 'kibana' ~ ( (openshift_logging_kibana_ops_deployment | default(false) | bool) | ternary('-ops', '')) }}"
 
 - name: Retrieving the cert to use when generating secrets for the logging components
   slurp:
@@ -53,6 +55,21 @@
     - { name: "kibana_internal_cert", file: "kibana-internal.crt"}
     - { name: "server_tls", file: "server-tls.json"}
 
+# services
+- name: Set {{ kibana_name }} service
+  oc_service:
+    state: present
+    name: "{{ kibana_name }}"
+    namespace: "{{ openshift_logging_kibana_namespace }}"
+    selector:
+      component: "{{ kibana_component }}"
+      provider: openshift
+#    labels:
+#    - logging-infra: 'support'
+    ports:
+    - port: 443
+      targetPort: "oaproxy"
+
 # create routes
 # TODO: set up these certs differently?
 - set_fact:
@@ -94,6 +111,7 @@
       provider: openshift
   changed_when: no
 
+# This currently has an issue if the host name changes
 - name: Setting Kibana route
   oc_obj:
     state: present
@@ -181,7 +199,7 @@
     src: kibana.j2
     dest: "{{ tempdir }}/templates/kibana-dc.yaml"
   vars:
-    component: kibana
+    component: "{{ kibana_component }}"
     logging_component: kibana
     deploy_name: "{{ kibana_name }}"
     image: "{{ openshift_logging_image_prefix }}logging-kibana:{{ openshift_logging_image_version }}"
-- 
cgit v1.2.1