diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-08-25 10:24:53 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-08-25 10:24:53 -0400 |
| commit | cd0d6e5c3fd7cded8c70e210f1e7196a7b0a37d9 (patch) | |
| tree | 1d1d65a3e5e41201cf3b7b4d5c593f13c4683135 /roles/openshift_logging | |
| parent | affdabe9d5182fb2dca846f4a236aa3af112b68b (diff) | |
| download | openshift-cd0d6e5c3fd7cded8c70e210f1e7196a7b0a37d9.tar.gz openshift-cd0d6e5c3fd7cded8c70e210f1e7196a7b0a37d9.tar.bz2 openshift-cd0d6e5c3fd7cded8c70e210f1e7196a7b0a37d9.tar.xz openshift-cd0d6e5c3fd7cded8c70e210f1e7196a7b0a37d9.zip | |
fix #5206. Default ES cpu limit
Diffstat (limited to 'roles/openshift_logging')
| -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 8b0f4cb62..f07d7e6da 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -84,7 +84,7 @@ openshift_logging_es_ca: /etc/fluent/keys/ca openshift_logging_es_client_cert: /etc/fluent/keys/cert openshift_logging_es_client_key: /etc/fluent/keys/key openshift_logging_es_cluster_size: "{{ openshift_hosted_logging_elasticsearch_cluster_size | default(1) }}" -openshift_logging_es_cpu_limit: null +openshift_logging_es_cpu_limit: 1000m # 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') }}" @@ -125,7 +125,7 @@ openshift_logging_es_ops_ca: /etc/fluent/keys/ca openshift_logging_es_ops_client_cert: /etc/fluent/keys/cert 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_cpu_limit: 1000m openshift_logging_es_ops_memory_limit: "{{ openshift_hosted_logging_elasticsearch_ops_instance_ram | default('8Gi') }}" openshift_logging_es_ops_pv_selector: "{{ openshift_hosted_loggingops_storage_labels | default('') }}" openshift_logging_es_ops_pvc_dynamic: "{{ openshift_hosted_logging_elasticsearch_ops_pvc_dynamic | default(False) }}" |