kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed env vars DOCKER_NETWORK_OPTIONS and INSECURE_REGISTRY from docker.service.j2 (#6126)

pull/6133/head
Hector S 2020-05-12 22:46:21 +02:00 committed by GitHub
parent ed12936be2
commit a3131e271a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/container-engine/docker/templates/docker.service.j2
View File

@ -30,9 +30,7 @@ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is ve
{% endif %} {% endif %}
$DOCKER_OPTS \ $DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \ $DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \ $DOCKER_DNS_OPTIONS
$DOCKER_DNS_OPTIONS \
$INSECURE_REGISTRY
{% if not is_ostree and systemd_version.stdout|int >= 226 %} {% if not is_ostree and systemd_version.stdout|int >= 226 %}
TasksMax=infinity TasksMax=infinity
{% endif %} {% endif %}