summaryrefslogtreecommitdiffstats
path: root/roles/contiv_auth_proxy
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-04 22:59:43 -0700
committerGitHub <noreply@github.com>2017-10-04 22:59:43 -0700
commit5080e6c5c5fd26128280cebf63632d3190b29e64 (patch)
tree71b0c9f4b0da39372e35e7328bc7e6b908e30cee /roles/contiv_auth_proxy
parent19344491989a2d51b85b9804080da3b30351b911 (diff)
parentf338d1d86ef41c3c725881c24ca0522d147bf20f (diff)
downloadopenshift-5080e6c5c5fd26128280cebf63632d3190b29e64.tar.gz
openshift-5080e6c5c5fd26128280cebf63632d3190b29e64.tar.bz2
openshift-5080e6c5c5fd26128280cebf63632d3190b29e64.tar.xz
openshift-5080e6c5c5fd26128280cebf63632d3190b29e64.zip
Merge pull request #5616 from wozniakjan/logging/elasticsearch/honor_es_cpu_settings
Automatic merge from submit-queue. 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 setting `openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit` and when the role is included as -ops, it overrides this setting with `openshift_logging_es_ops_cpu_limit`.
Diffstat (limited to 'roles/contiv_auth_proxy')
0 files changed, 0 insertions, 0 deletions