diff --git a/inventory/sample/group_vars/all/docker.yml b/inventory/sample/group_vars/all/docker.yml index 4f8969bd7..c1a1dd85a 100644 --- a/inventory/sample/group_vars/all/docker.yml +++ b/inventory/sample/group_vars/all/docker.yml @@ -28,12 +28,12 @@ docker_bin_dir: "/usr/bin" ## An obvious use case is allowing insecure-registry access to self hosted registries. ## Can be ipddress and domain_name. ## example define 172.19.16.11 or mirror.registry.io -#insecure_registries: +#docker_insecure_registries: # - mirror.registry.io # - 172.19.16.11 ## Add other registry,example China registry mirror. -#registry_mirrors: +#docker_registry_mirrors: # - https://registry.docker-cn.com # - https://mirror.aliyuncs.com @@ -47,11 +47,11 @@ docker_bin_dir: "/usr/bin" ## 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 insecure_registries is defined -%} - {{ insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} + {%- if docker_insecure_registries is defined -%} + {{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} {%- endif %} - {% if registry_mirrors is defined -%} - {{ registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} + {% if docker_registry_mirrors is defined -%} + {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {%- endif %} --graph={{ docker_daemon_graph }} {{ docker_log_opts }} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 6288811eb..0a3c4c523 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -169,12 +169,12 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5" ## An obvious use case is allowing insecure-registry access to self hosted registries. ## Can be ipddress and domain_name. ## example define 172.19.16.11 or mirror.registry.io -# insecure_registries: +# docker_insecure_registries: # - mirror.registry.io # - 172.19.16.11 ## Add other registry,example China registry mirror. -# registry_mirrors: +# docker_registry_mirrors: # - https://registry.docker-cn.com # - https://mirror.aliyuncs.com @@ -188,11 +188,11 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5" ## 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 insecure_registries is defined -%} - {{ insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} + {%- if docker_insecure_registries is defined -%} + {{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} {%- endif %} - {% if registry_mirrors is defined -%} - {{ registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} + {% if docker_registry_mirrors is defined -%} + {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {%- endif %} --graph={{ docker_daemon_graph }} {{ docker_log_opts }} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}