diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-16 14:25:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 14:25:43 -0400 |
| commit | a4c8b2d019756cbba01d9d2f41add3926c21fb8d (patch) | |
| tree | f12b59aefd522933a97957dc3a7413448f3d96b8 /roles/openshift_logging/defaults | |
| parent | 4c314a6fdce13a0e74736c1548dd0d280d315536 (diff) | |
| parent | 52726611f182c6db390d7a964f0bf24fed297761 (diff) | |
| download | openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.gz openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.bz2 openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.xz openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.zip | |
Merge pull request #3664 from ewolinetz/logging_cherrypick_3657
Merged by openshift-bot
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 ad9c1ce42..f433ee891 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -22,7 +22,7 @@ openshift_logging_curator_ops_cpu_limit: 100m openshift_logging_curator_ops_memory_limit: null openshift_logging_curator_ops_nodeselector: "{{ openshift_hosted_logging_curator_ops_nodeselector | default('') | map_from_pairs }}" -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_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" openshift_logging_kibana_cpu_limit: null openshift_logging_kibana_memory_limit: null openshift_logging_kibana_proxy_debug: false @@ -46,7 +46,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_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" openshift_logging_kibana_ops_cpu_limit: null openshift_logging_kibana_ops_memory_limit: null openshift_logging_kibana_ops_proxy_debug: false @@ -99,7 +99,7 @@ openshift_logging_es_ops_storage_group: "{{ openshift_hosted_logging_elasticsear openshift_logging_es_ops_nodeselector: "{{ openshift_hosted_logging_elasticsearch_ops_nodeselector | default('') | map_from_pairs }}" # storage related defaults -openshift_logging_storage_access_modes: "{{ openshift_hosted_logging_storage_access_modes | default('ReadWriteOnce') }}" +openshift_logging_storage_access_modes: "{{ openshift_hosted_logging_storage_access_modes | default(['ReadWriteOnce']) }}" # following can be uncommented to provide values for configmaps -- take care when providing file contents as it may cause your cluster to not operate correctly |