浏览代码

Merge pull request #7733 from ewolinetz/logging_remove_cpulimits

Removing non-null default for cpu_limit for es
OpenShift Merge Robot 7 年之前
父节点
当前提交
d454e8e61d
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      roles/openshift_logging_elasticsearch/defaults/main.yml

+ 1 - 1
roles/openshift_logging_elasticsearch/defaults/main.yml

@@ -4,7 +4,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: "{{ openshift_logging_es_cpu_limit | default('') }}"
+openshift_logging_elasticsearch_cpu_limit: null
 openshift_logging_elasticsearch_cpu_request: "{{ openshift_logging_es_cpu_request | 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') }}"