summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted_logging/vars
diff options
context:
space:
mode:
authorJohn Kwiatkoski <jkwiatko@redhat.com>2016-03-23 14:43:43 -0400
committerJohn Kwiatkoski <jkwiatko@redhat.com>2016-03-23 14:43:43 -0400
commita181c8705a4730eebc35339c55e39ca7ff3bf90c (patch)
treec8140a46bbab49d9af95a70a7b38c1dcf80886cf /roles/openshift_hosted_logging/vars
parent7fa2d035c9f2051e5e07134522871ea23f85e52c (diff)
downloadopenshift-a181c8705a4730eebc35339c55e39ca7ff3bf90c.tar.gz
openshift-a181c8705a4730eebc35339c55e39ca7ff3bf90c.tar.bz2
openshift-a181c8705a4730eebc35339c55e39ca7ff3bf90c.tar.xz
openshift-a181c8705a4730eebc35339c55e39ca7ff3bf90c.zip
Tested of refactored code
Diffstat (limited to 'roles/openshift_hosted_logging/vars')
-rw-r--r--roles/openshift_hosted_logging/vars/main.yaml9
1 files changed, 5 insertions, 4 deletions
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"