C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docker: Set Cgroup driver by default to systemd (#6563)

Browse source 
* Set Docker Cgroup driver to systemd

* Add docker_cgroup_driver in Docker defaults
This commit is contained in:
Barry Melbourne 2020-08-31 12:56:20 +01:00 committed by GitHub
parent 5a8b68a429
commit 03c9c091f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
inventory/sample/group_vars/all/docker.yml
View file

@ -10,6 +10,10 @@ docker_container_storage_setup: false
## Otherwise docker-storage-setup will be executed incorrectly. ## Otherwise docker-storage-setup will be executed incorrectly.
# docker_container_storage_setup_devs: /dev/vdb # docker_container_storage_setup_devs: /dev/vdb
## Uncomment this if you want to change the Docker Cgroup driver (native.cgroupdriver)
## Valid options are systemd or cgroupfs, default is systemd
# docker_cgroup_driver: systemd
## Uncomment this if you have more than 3 nameservers, then we'll only use the first 3. ## Uncomment this if you have more than 3 nameservers, then we'll only use the first 3.
docker_dns_servers_strict: false docker_dns_servers_strict: false

2
roles/container-engine/docker/defaults/main.yml
View file

@ -18,6 +18,8 @@ dockerproject_repo_key_info:
dockerproject_repo_info: dockerproject_repo_info:
repos: repos:
docker_cgroup_driver: systemd
docker_dns_servers_strict: true docker_dns_servers_strict: true
docker_container_storage_setup: false docker_container_storage_setup: false

4
roles/container-engine/docker/templates/docker-options.conf.j2
View file

@ -1,12 +1,12 @@
[Service] [Service]
Environment="DOCKER_OPTS={{ docker_options|default('') }} --iptables={{ docker_iptables_enabled | default('false') }} \ Environment="DOCKER_OPTS={{ docker_options|default('') }} --iptables={{ docker_iptables_enabled | default('false') }} \
--exec-opt native.cgroupdriver={{ docker_cgroup_driver }} \
{% for i in docker_insecure_registries %}--insecure-registry={{ i }} {% endfor %} \ {% for i in docker_insecure_registries %}--insecure-registry={{ i }} {% endfor %} \
{% for i in docker_registry_mirrors %}--registry-mirror={{ i }} {% endfor %} \ {% for i in docker_registry_mirrors %}--registry-mirror={{ i }} {% endfor %} \
{% if docker_version != "latest" and docker_version is version('17.05', '<') %}--graph={% else %}--data-root={% endif %}{{ docker_daemon_graph }} \ {% if docker_version != "latest" and docker_version is version('17.05', '<') %}--graph={% else %}--data-root={% endif %}{{ docker_daemon_graph }} \
{% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %} \ {% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %} \
{% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} \ {% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} \
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \ --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current --default-runtime=docker-runc \
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd \
--userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false \ --userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false \
{% endif %}" {% endif %}"