summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-29 16:00:48 -0400
committerGitHub <noreply@github.com>2016-09-29 16:00:48 -0400
commit2f83d7fc4a9d9880db772fcbf8e06a5ee03f5213 (patch)
tree05b844c272708cd4d482d27331c31bbad881af4d
parentcd922e0f4a1370118c0e2fd60230a68d74b47095 (diff)
parent95a73f2217a446a6eabd475bd6086ffc4d72ed99 (diff)
downloadopenshift-2f83d7fc4a9d9880db772fcbf8e06a5ee03f5213.tar.gz
openshift-2f83d7fc4a9d9880db772fcbf8e06a5ee03f5213.tar.bz2
openshift-2f83d7fc4a9d9880db772fcbf8e06a5ee03f5213.tar.xz
openshift-2f83d7fc4a9d9880db772fcbf8e06a5ee03f5213.zip
Merge pull request #2532 from abutcher/logging-deploy-bool
Default openshift_hosted_{logging,metrics}_deploy to false.
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index 3975e2686..e688556b3 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -49,9 +49,9 @@
when: not openshift.common.version_gte_3_2_or_1_2
- role: openshift_hosted
- role: openshift_metrics
- when: openshift.hosted.metrics.deploy | bool
+ when: openshift_hosted_metrics_deploy | default(false) | bool
- role: openshift_hosted_logging
- when: openshift.hosted.logging.deploy | bool
+ when: openshift_hosted_logging_deploy | default(false) | bool
openshift_hosted_logging_hostname: "{{ logging_hostname }}"
openshift_hosted_logging_ops_hostname: "{{ logging_ops_hostname }}"
openshift_hosted_logging_master_public_url: "{{ logging_master_public_url }}"