summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-26 16:07:41 -0400
committerGitHub <noreply@github.com>2017-06-26 16:07:41 -0400
commit2d4c399cd6a909531aa07717ac60a07f0022df6d (patch)
tree629467fa12742e31ad83ead6bc1564ce8851b9a9 /roles/openshift_logging
parent47917dc0df618a4e897cf863d86cef0963d77d60 (diff)
parent38a6982eacb254eebdaecb9d9adffef66d0fcc46 (diff)
downloadopenshift-2d4c399cd6a909531aa07717ac60a07f0022df6d.tar.gz
openshift-2d4c399cd6a909531aa07717ac60a07f0022df6d.tar.bz2
openshift-2d4c399cd6a909531aa07717ac60a07f0022df6d.tar.xz
openshift-2d4c399cd6a909531aa07717ac60a07f0022df6d.zip
Merge pull request #4569 from simon3z/empty-labels
Use empty default for storage labels
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml
index 66d880d23..9b7767ccd 100644
--- a/roles/openshift_logging/defaults/main.yml
+++ b/roles/openshift_logging/defaults/main.yml
@@ -89,7 +89,7 @@ openshift_logging_es_cpu_limit: null
# the logging appenders for the root loggers to write ES logs. Valid values: 'file', 'console'
openshift_logging_es_log_appenders: ['file']
openshift_logging_es_memory_limit: "{{ openshift_hosted_logging_elasticsearch_instance_ram | default('8Gi') }}"
-openshift_logging_es_pv_selector: "{{ openshift_hosted_logging_storage_labels | default(null) }}"
+openshift_logging_es_pv_selector: "{{ openshift_hosted_logging_storage_labels | default('') }}"
openshift_logging_es_pvc_dynamic: "{{ openshift_hosted_logging_elasticsearch_pvc_dynamic | default(False) }}"
openshift_logging_es_pvc_size: "{{ openshift_hosted_logging_elasticsearch_pvc_size | default('') }}"
openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_prefix | default('logging-es') }}"