summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-02-08 16:43:14 -0600
committerewolinetz <ewolinet@redhat.com>2017-02-08 16:43:14 -0600
commit10b809ffa7edad6e21744c92fe744fc45073694a (patch)
tree39091a84f22674c45ed85d17b6a5c67274673fcc /playbooks/common
parent8977765b44da953dd23942ef3335aebab5142d95 (diff)
downloadopenshift-10b809ffa7edad6e21744c92fe744fc45073694a.tar.gz
openshift-10b809ffa7edad6e21744c92fe744fc45073694a.tar.bz2
openshift-10b809ffa7edad6e21744c92fe744fc45073694a.tar.xz
openshift-10b809ffa7edad6e21744c92fe744fc45073694a.zip
Updating defaults to pull from previously defined variable names used in playbooks
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index 3c4a99887..ca4f5b8b2 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -27,9 +27,9 @@
logging_elasticsearch_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}"
roles:
- role: openshift_hosted
- - role: openshift_hosted_metrics
+ - role: openshift_metrics
when: openshift_hosted_metrics_deploy | default(false) | bool
- - role: openshift_hosted_logging
+ - role: openshift_logging
when: openshift_hosted_logging_deploy | default(false) | bool
openshift_hosted_logging_hostname: "{{ logging_hostname }}"
openshift_hosted_logging_ops_hostname: "{{ logging_ops_hostname }}"
@@ -52,11 +52,11 @@
- hosted
pre_tasks:
- set_fact:
- logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
+ openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
tasks:
- block:
- include_role:
- name: openshift_hosted_logging
+ name: openshift_logging
tasks_from: update_master_config
when: openshift_hosted_logging_deploy | default(false) | bool