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

Remove default docker_options from sample (#5287)

Browse source
This commit is contained in:
Johannes Scheuermann 2019-11-11 12:23:40 +01:00 committed by Kubernetes Prow Robot
parent 076f254a67
commit feac802456
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ docker_rpm_keepcache: 0
# - https://registry.docker-cn.com # - https://registry.docker-cn.com
# - https://mirror.aliyuncs.com # - https://mirror.aliyuncs.com
## If non-empty will override default system MounFlags value. ## If non-empty will override default system MountFlags value.
## This option takes a mount propagation flag: shared, slave ## This option takes a mount propagation flag: shared, slave
## or private, which control whether mounts in the file system ## or private, which control whether mounts in the file system
## namespace set up for docker will receive or propagate mounts ## namespace set up for docker will receive or propagate mounts
@ -52,19 +52,3 @@ docker_rpm_keepcache: 0
## A string of extra options to pass to the docker daemon. ## A string of extra options to pass to the docker daemon.
## This string should be exactly as you wish it to appear. ## This string should be exactly as you wish it to appear.
docker_options: >- docker_options: >-
{%- if docker_insecure_registries is defined %}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %}
{% if docker_registry_mirrors is defined %}
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{%- endif %}
{%- if docker_version != "latest" and docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %}
{%- else %}
--data-root={{ docker_daemon_graph }} {% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %}
{%- endif %}
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
--userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false
{%- endif -%}