diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2017-02-01 16:46:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 16:46:58 -0500 |
| commit | c9480811d2222693abe4460ca42c292b289a0ef4 (patch) | |
| tree | fafd0f443ff0174f7ef984d9d177079ed1b64aa5 /playbooks | |
| parent | 287282e3a1c36ea2c7bc9eb14e463fd347c7d95a (diff) | |
| parent | d20a7403748438e7d9651d83d1b513a27ba9b9a4 (diff) | |
| download | openshift-c9480811d2222693abe4460ca42c292b289a0ef4.tar.gz openshift-c9480811d2222693abe4460ca42c292b289a0ef4.tar.bz2 openshift-c9480811d2222693abe4460ca42c292b289a0ef4.tar.xz openshift-c9480811d2222693abe4460ca42c292b289a0ef4.zip | |
Merge pull request #3248 from abutcher/include-role-when
Wrap openshift_hosted_logging include_role within a block.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 34f1a979b..143bc37a2 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -47,12 +47,15 @@ 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 + hosts: oo_masters_to_config:!oo_first_master + tags: + - hosted 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 + - block: + - include_role: + name: openshift_hosted_logging + tasks_from: update_master_config when: openshift_hosted_logging_deploy | default(false) | bool |