summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-25 11:00:39 -0400
committerGitHub <noreply@github.com>2017-08-25 11:00:39 -0400
commitf1d98352736169d51a3ea838b8feea4c07d8cccc (patch)
treec03ac73b5e075c85b77629d0a92fc255f2177714
parentcb410326799b14bfbc970585d495e861d38460f4 (diff)
parentcd0d6e5c3fd7cded8c70e210f1e7196a7b0a37d9 (diff)
downloadopenshift-f1d98352736169d51a3ea838b8feea4c07d8cccc.tar.gz
openshift-f1d98352736169d51a3ea838b8feea4c07d8cccc.tar.bz2
openshift-f1d98352736169d51a3ea838b8feea4c07d8cccc.tar.xz
openshift-f1d98352736169d51a3ea838b8feea4c07d8cccc.zip
Merge pull request #5212 from jcantrill/fix_5206_cpu_defaults
fix #5206. Default ES cpu limit
-rw-r--r--roles/openshift_logging/defaults/main.yml4
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) }}"