From a181c8705a4730eebc35339c55e39ca7ff3bf90c Mon Sep 17 00:00:00 2001 From: John Kwiatkoski Date: Wed, 23 Mar 2016 14:43:43 -0400 Subject: Tested of refactored code --- roles/openshift_hosted_logging/vars/main.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'roles/openshift_hosted_logging/vars') diff --git a/roles/openshift_hosted_logging/vars/main.yaml b/roles/openshift_hosted_logging/vars/main.yaml index 7baef0311..586c2ab91 100644 --- a/roles/openshift_hosted_logging/vars/main.yaml +++ b/roles/openshift_hosted_logging/vars/main.yaml @@ -1,5 +1,6 @@ -kh_kv: KIBANA_HOSTNAME={{ openshift_hosted_logging_hostname | quote }} -es_cs_kv: ES_CLUSTER_SIZE={{ openshift_hosted_logging_elasticsearch_cluster_size | quote }} -pmu_kv: PUBLIC_MASTER_URL={{ openshift_hosted_logging_master_public_url | quote }} +kh_kv: "KIBANA_HOSTNAME={{ openshift_hosted_logging_hostname | quote }}" +es_cs_kv: "ES_CLUSTER_SIZE={{ openshift_hosted_logging_elasticsearch_cluster_size | quote }}" +pmu_kv: "PUBLIC_MASTER_URL={{ openshift_hosted_logging_master_public_url | quote }}" ip_kv: "{{ 'IMAGE_PREFIX=' ~ target_registry | quote if target_registry is defined else '' }}" -oc_process_values: "{{ kh_kv }} {{ es_cs_kv }} {{ pmu_kv }} {{ ip_kv }}" +oc_process_values: "{{ kh_kv }},{{ es_cs_kv }},{{ pmu_kv }},{{ ip_kv }}" +openshift_master_config_dir: "{{ openshift.common.config_base }}/master" -- cgit v1.2.3