From feac802456b899211d2ff18f330ff6a56af6d1b1 Mon Sep 17 00:00:00 2001 From: Johannes Scheuermann Date: Mon, 11 Nov 2019 12:23:40 +0100 Subject: [PATCH] Remove default docker_options from sample (#5287) --- inventory/sample/group_vars/all/docker.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/inventory/sample/group_vars/all/docker.yml b/inventory/sample/group_vars/all/docker.yml index 4e2a5594f..5e569ef6b 100644 --- a/inventory/sample/group_vars/all/docker.yml +++ b/inventory/sample/group_vars/all/docker.yml @@ -42,7 +42,7 @@ docker_rpm_keepcache: 0 # - https://registry.docker-cn.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 ## or private, which control whether mounts in the file system ## 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. ## This string should be exactly as you wish it to appear. 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 -%}