summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-30 14:44:43 -0500
committerGitHub <noreply@github.com>2017-01-30 14:44:43 -0500
commit3372da1e38a73a3f005e6263e7ccdb5aa858106a (patch)
tree1c3fe32b6b9f000c6312cef130c1b9db9df018e3 /playbooks/common
parentdb3718ef7107aeb010ebfd9d1493e94c8b302556 (diff)
parentd5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a (diff)
downloadopenshift-3372da1e38a73a3f005e6263e7ccdb5aa858106a.tar.gz
openshift-3372da1e38a73a3f005e6263e7ccdb5aa858106a.tar.bz2
openshift-3372da1e38a73a3f005e6263e7ccdb5aa858106a.tar.xz
openshift-3372da1e38a73a3f005e6263e7ccdb5aa858106a.zip
Merge pull request #3214 from ewolinetz/logging_configure_loggingpublicurl
Updating openshift_logging role to add kibana public url to loggingPu…
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml11
-rw-r--r--playbooks/common/openshift-cluster/openshift_logging.yml8
2 files changed, 19 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index ec5b18389..a5b26c7de 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -45,3 +45,14 @@
- role: cockpit-ui
when: ( openshift.common.version_gte_3_3_or_1_3 | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool)
+
+- name: Update master-config for publicLoggingURL
+ hosts: masters:!oo_first_master
+ pre_tasks:
+ - set_fact:
+ logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
+ tasks:
+ - include_role:
+ name: openshift_hosted_logging
+ tasks_from: update_master_config
+ when: openshift_hosted_logging_deploy | default(false) | boola
diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml
index 6347cbc26..580d1e5a7 100644
--- a/playbooks/common/openshift-cluster/openshift_logging.yml
+++ b/playbooks/common/openshift-cluster/openshift_logging.yml
@@ -3,3 +3,11 @@
hosts: oo_first_master
roles:
- openshift_logging
+
+- name: Update Master configs
+ hosts: masters:!oo_first_master
+ tasks:
+ - include_role:
+ name: openshift_logging
+ tasks_from: update_master_config
+ when: openshift_logging_install_logging | default(false) | bool