openshift / openshift-ansible / 9145 / 1

51%

master: 51%

push

travis-ci

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`.

2239 of 5648 branches covered (39.64%)

7307 of 13419 relevant lines covered (54.45%)

0.54 hits per line