Skip to content

Commit

Permalink
Remove systemd version + ostree check for docker TasksMax (#11493)
Browse files Browse the repository at this point in the history
systemd ignores unknown keys (with a warning) so version checking is not
necessary.
There is no rationale for excluding it from ostree systems either.
  • Loading branch information
VannTen authored Sep 2, 2024
1 parent 03372d8 commit e744a11
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
10 changes: 0 additions & 10 deletions roles/container-engine/docker/tasks/systemd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@
notify: Restart docker
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
template:
src: docker.service.j2
Expand Down
2 changes: 0 additions & 2 deletions roles/container-engine/docker/templates/docker.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ ExecStart={{ docker_bin_dir }}/dockerd \
$DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_DNS_OPTIONS
{% if not is_ostree and systemd_version.stdout|int >= 226 %}
TasksMax=infinity
{% endif %}
LimitNOFILE=1048576
LimitNPROC=1048576
LimitCORE=infinity
Expand Down

0 comments on commit e744a11

Please sign in to comment.