Merge pull request #2357 from octarinesec/eyeofthefrog/set_TasksMax_infinity_for_ubuntu
Set TasksMax to infinity on any OS with systemd
This commit is contained in:
commit
4b5f780ff0
2 changed files with 3 additions and 3 deletions
|
@ -12,9 +12,9 @@
|
||||||
when: http_proxy is defined or https_proxy is defined
|
when: http_proxy is defined or https_proxy is defined
|
||||||
|
|
||||||
- name: get systemd version
|
- name: get systemd version
|
||||||
command: rpm -q --qf '%{V}\n' systemd
|
command: systemctl --version | head -n 1 | cut -d " " -f 2
|
||||||
register: systemd_version
|
register: systemd_version
|
||||||
when: ansible_os_family == "RedHat" and not is_atomic
|
when: not is_atomic
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
||||||
- name: Write docker.service systemd file
|
- name: Write docker.service systemd file
|
||||||
|
|
|
@ -24,7 +24,7 @@ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout|versi
|
||||||
$DOCKER_NETWORK_OPTIONS \
|
$DOCKER_NETWORK_OPTIONS \
|
||||||
$DOCKER_DNS_OPTIONS \
|
$DOCKER_DNS_OPTIONS \
|
||||||
$INSECURE_REGISTRY
|
$INSECURE_REGISTRY
|
||||||
{% if ansible_os_family == "RedHat" and systemd_version.stdout|int >= 226 %}
|
{% if not is_atomic and systemd_version.stdout|int >= 226 %}
|
||||||
TasksMax=infinity
|
TasksMax=infinity
|
||||||
{% endif %}
|
{% endif %}
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
|
|
Loading…
Reference in a new issue