Remove systemd version + ostree check for docker TasksMax (#11493)
systemd ignores unknown keys (with a warning) so version checking is not necessary. There is no rationale for excluding it from ostree systems either.pull/11499/head
parent
03372d883a
commit
e744a117d6
|
@ -13,16 +13,6 @@
|
||||||
notify: Restart docker
|
notify: Restart docker
|
||||||
when: http_proxy is defined or https_proxy is defined
|
when: http_proxy is defined or https_proxy is defined
|
||||||
|
|
||||||
- name: Get systemd version
|
|
||||||
# noqa command-instead-of-module - systemctl is called intentionally here
|
|
||||||
shell: set -o pipefail && systemctl --version | head -n 1 | cut -d " " -f 2
|
|
||||||
args:
|
|
||||||
executable: /bin/bash
|
|
||||||
register: systemd_version
|
|
||||||
when: not is_ostree
|
|
||||||
changed_when: false
|
|
||||||
check_mode: false
|
|
||||||
|
|
||||||
- name: Write docker.service systemd file
|
- name: Write docker.service systemd file
|
||||||
template:
|
template:
|
||||||
src: docker.service.j2
|
src: docker.service.j2
|
||||||
|
|
|
@ -31,9 +31,7 @@ ExecStart={{ docker_bin_dir }}/dockerd \
|
||||||
$DOCKER_OPTS \
|
$DOCKER_OPTS \
|
||||||
$DOCKER_STORAGE_OPTIONS \
|
$DOCKER_STORAGE_OPTIONS \
|
||||||
$DOCKER_DNS_OPTIONS
|
$DOCKER_DNS_OPTIONS
|
||||||
{% if not is_ostree and systemd_version.stdout|int >= 226 %}
|
|
||||||
TasksMax=infinity
|
TasksMax=infinity
|
||||||
{% endif %}
|
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
LimitNPROC=1048576
|
LimitNPROC=1048576
|
||||||
LimitCORE=infinity
|
LimitCORE=infinity
|
||||||
|
|
Loading…
Reference in New Issue