diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-16 09:47:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 09:47:51 -0500 |
| commit | bf6c877eb0261617e0be424b24d7e13b6677cba9 (patch) | |
| tree | 80507b759059829e009cc81f226ebdf185a580f1 /roles/openshift_logging/defaults | |
| parent | bdbb8d2ec6e81ec0eb8b5b5c512583392af2004d (diff) | |
| parent | 42cda5ca1d0ec0017b37ac288aefa74ca92ab640 (diff) | |
| download | openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.tar.gz openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.tar.bz2 openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.tar.xz openshift-bf6c877eb0261617e0be424b24d7e13b6677cba9.zip | |
Merge pull request #3373 from ewolinetz/logging_fix_kibana_routes
Fixing default for logging
Diffstat (limited to 'roles/openshift_logging/defaults')
| -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 |