summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Wozniak <jwozniak@redhat.com>2017-10-02 15:01:07 +0200
committerJan Wozniak <jwozniak@redhat.com>2017-10-02 15:01:07 +0200
commitf338d1d86ef41c3c725881c24ca0522d147bf20f (patch)
treeef38fd6e6989b7a29e2e52ca0cbf2800dc52c2cb
parent54ea443f4ad24ad311c0a036cf283f9e39c865ee (diff)
downloadopenshift-f338d1d86ef41c3c725881c24ca0522d147bf20f.tar.gz
openshift-f338d1d86ef41c3c725881c24ca0522d147bf20f.tar.bz2
openshift-f338d1d86ef41c3c725881c24ca0522d147bf20f.tar.xz
openshift-f338d1d86ef41c3c725881c24ca0522d147bf20f.zip
logging: honor openshift_logging_es_cpu_limit
PR https://github.com/openshift/openshift-ansible/pull/3509 has removed any usage of `openshift_logging_es_cpu_limit`. Currently, the `openshift_logging_elasticsearch_cpu_limit` is either default '1000m' or derived from `openshift_logging_es_ops_cpu_limit` but if user sets the `openshift_logging_es_cpu_limit` in the inventory as documented, its value is ignored. This PR fixes the issue by trying to set openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit And including the role as -ops overrides this setting.
-rw-r--r--roles/openshift_logging_elasticsearch/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml
index 75bd479be..384707378 100644
--- a/roles/openshift_logging_elasticsearch/defaults/main.yml
+++ b/roles/openshift_logging_elasticsearch/defaults/main.yml
@@ -6,7 +6,7 @@ openshift_logging_elasticsearch_image_pull_secret: "{{ openshift_hosted_logging_
openshift_logging_elasticsearch_namespace: logging
openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_nodeselector | default('') }}"
-openshift_logging_elasticsearch_cpu_limit: 1000m
+openshift_logging_elasticsearch_cpu_limit: "{{ openshift_logging_es_cpu_limit | default('1000m') }}"
openshift_logging_elasticsearch_memory_limit: "{{ openshift_logging_es_memory_limit | default('1Gi') }}"
openshift_logging_elasticsearch_recover_after_time: "{{ openshift_logging_es_recover_after_time | default('5m') }}"