diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-30 14:44:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 14:44:43 -0500 |
| commit | 3372da1e38a73a3f005e6263e7ccdb5aa858106a (patch) | |
| tree | 1c3fe32b6b9f000c6312cef130c1b9db9df018e3 /playbooks | |
| parent | db3718ef7107aeb010ebfd9d1493e94c8b302556 (diff) | |
| parent | d5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a (diff) | |
| download | openshift-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')
| -rw-r--r-- | playbooks/adhoc/openshift_hosted_logging_efk.yaml | 11 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 11 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_logging.yml | 8 |
3 files changed, 30 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 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 |