diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-13 16:02:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 16:02:18 -0400 |
| commit | 3fed1873230d9e84c07824b7de98ae7edfc481ba (patch) | |
| tree | e97d2dae693b22f30976e5804bdd02cc591cc84b /roles/openshift_logging/defaults | |
| parent | 75a46c184bda80158c085bcd38b40fd4d02aabd0 (diff) | |
| parent | ee59257a018f081efa1f121cba40f857e07e9ef5 (diff) | |
| download | openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.gz openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.bz2 openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.xz openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.zip | |
Merge pull request #4302 from ewolinetz/pv_node_selectors
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/defaults')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 573cbdd09..3c343c9dc 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -87,7 +87,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: null +openshift_logging_es_pv_selector: "{{ openshift_hosted_logging_storage_labels | default(null) }}" 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') }}" @@ -126,7 +126,7 @@ openshift_logging_es_ops_client_key: /etc/fluent/keys/key openshift_logging_es_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}" openshift_logging_es_ops_cpu_limit: null openshift_logging_es_ops_memory_limit: "{{ openshift_hosted_logging_elasticsearch_ops_instance_ram | default('8Gi') }}" -openshift_logging_es_ops_pv_selector: None +openshift_logging_es_ops_pv_selector: "{{ openshift_hosted_loggingops_storage_labels | default(null) }}" openshift_logging_es_ops_pvc_dynamic: "{{ openshift_hosted_logging_elasticsearch_ops_pvc_dynamic | default(False) }}" openshift_logging_es_ops_pvc_size: "{{ openshift_hosted_logging_elasticsearch_ops_pvc_size | default('') }}" openshift_logging_es_ops_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_ops_pvc_prefix | default('logging-es-ops') }}" |