summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-01-30 12:50:57 -0600
committerewolinetz <ewolinet@redhat.com>2017-01-30 12:58:09 -0600
commitd5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a (patch)
treeb6c85ace5953f8ca99a048b5938b3e2c80313d7f /playbooks
parentc9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6 (diff)
downloadopenshift-d5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a.tar.gz
openshift-d5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a.tar.bz2
openshift-d5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a.tar.xz
openshift-d5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a.zip
Updating openshift_hosted_logging to update master-configs with publicLoggingURL
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/adhoc/openshift_hosted_logging_efk.yaml11
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml11
-rw-r--r--playbooks/common/openshift-cluster/openshift_logging.yml1
3 files changed, 23 insertions, 0 deletions
diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml
index def1d24e0..c08231dda 100644
--- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml
+++ b/playbooks/adhoc/openshift_hosted_logging_efk.yaml
@@ -3,3 +3,14 @@
roles:
- role: openshift_hosted_logging
openshift_hosted_logging_cleanup: no
+
+- name: Update master-config for publicLoggingURL
+ hosts: masters:!masters[0]
+ 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) | bool
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 3257018a0..580d1e5a7 100644
--- a/playbooks/common/openshift-cluster/openshift_logging.yml
+++ b/playbooks/common/openshift-cluster/openshift_logging.yml
@@ -10,3 +10,4 @@
- include_role:
name: openshift_logging
tasks_from: update_master_config
+ when: openshift_logging_install_logging | default(false) | bool