From 54da5658227e8d12449b96237a59ca39fdaed6f1 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 1 Feb 2017 13:50:18 -0500 Subject: Fix openshift_hosted_logging bool typo. --- playbooks/common/openshift-cluster/openshift_hosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/common/openshift-cluster') diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 021d19dad..34f1a979b 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -55,4 +55,4 @@ - include_role: name: openshift_hosted_logging tasks_from: update_master_config - when: openshift_hosted_logging_deploy | default(false) | boola + when: openshift_hosted_logging_deploy | default(false) | bool -- cgit v1.2.3 From d20a7403748438e7d9651d83d1b513a27ba9b9a4 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 1 Feb 2017 15:23:07 -0500 Subject: Wrap openshift_hosted_logging include_role within a block. --- playbooks/common/openshift-cluster/openshift_hosted.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'playbooks/common/openshift-cluster') 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 -- cgit v1.2.3