diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-02-15 12:06:26 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-02-15 14:19:35 -0600 |
| commit | 0d4a4ec479812fba583dca95c6f54cd60e27d38e (patch) | |
| tree | 3147bab93d660fa8acb61a4bac0a1a9b1158ade8 /roles | |
| parent | c7f83e208ee433da74b7eb26644b30684a69649b (diff) | |
| download | openshift-0d4a4ec479812fba583dca95c6f54cd60e27d38e.tar.gz openshift-0d4a4ec479812fba583dca95c6f54cd60e27d38e.tar.bz2 openshift-0d4a4ec479812fba583dca95c6f54cd60e27d38e.tar.xz openshift-0d4a4ec479812fba583dca95c6f54cd60e27d38e.zip | |
fixing default for logging
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index d9eebe688..dea1a889a 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -3,7 +3,7 @@ openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | d openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default('latest') }}" openshift_logging_use_ops: False openshift_logging_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}" -openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://{{openshift.common.public_hostname}}:8443') }}" +openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':8443') }}" openshift_logging_namespace: logging openshift_logging_install_logging: True @@ -19,7 +19,7 @@ openshift_logging_curator_memory_limit: null openshift_logging_curator_ops_cpu_limit: 100m openshift_logging_curator_ops_memory_limit: null -openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.{{openshift.common.dns_domain}}') }}" +openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' + openshift.common.dns_domain) }}" openshift_logging_kibana_cpu_limit: null openshift_logging_kibana_memory_limit: null openshift_logging_kibana_proxy_debug: false @@ -39,7 +39,7 @@ openshift_logging_kibana_key: "" #for the public facing kibana certs openshift_logging_kibana_ca: "" -openshift_logging_kibana_ops_hostname: "{{ openshift_hosted_logging_ops_hostname | default('kibana-ops.{{openshift.common.dns_domain}}') }}" +openshift_logging_kibana_ops_hostname: "{{ openshift_hosted_logging_ops_hostname | default('kibana-ops.' + openshift.common.dns_domain) }}" openshift_logging_kibana_ops_cpu_limit: null openshift_logging_kibana_ops_memory_limit: null openshift_logging_kibana_ops_proxy_debug: false |