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

Add docker_ to values

Browse source
This commit is contained in:
rongzhang 2018-09-10 18:05:49 +08:00
parent 51794e4c13
commit f557b54489
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,12 +28,12 @@ docker_bin_dir: "/usr/bin"
## An obvious use case is allowing insecure-registry access to self hosted registries. ## An obvious use case is allowing insecure-registry access to self hosted registries.
## Can be ipddress and domain_name. ## Can be ipddress and domain_name.
## example define 172.19.16.11 or mirror.registry.io ## example define 172.19.16.11 or mirror.registry.io
#insecure_registries: #docker_insecure_registries:
# - mirror.registry.io # - mirror.registry.io
# - 172.19.16.11 # - 172.19.16.11
## Add other registry,example China registry mirror. ## Add other registry,example China registry mirror.
#registry_mirrors: #docker_registry_mirrors:
# - https://registry.docker-cn.com # - https://registry.docker-cn.com
# - https://mirror.aliyuncs.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. ## 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 insecure_registries is defined -%} {%- if docker_insecure_registries is defined -%}
{{ insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} {{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
{% if registry_mirrors is defined -%} {% if docker_registry_mirrors is defined -%}
{{ registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}

12
roles/kubespray-defaults/defaults/main.yaml
View file

@ -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. ## An obvious use case is allowing insecure-registry access to self hosted registries.
## Can be ipddress and domain_name. ## Can be ipddress and domain_name.
## example define 172.19.16.11 or mirror.registry.io ## example define 172.19.16.11 or mirror.registry.io
# insecure_registries: # docker_insecure_registries:
# - mirror.registry.io # - mirror.registry.io
# - 172.19.16.11 # - 172.19.16.11
## Add other registry,example China registry mirror. ## Add other registry,example China registry mirror.
# registry_mirrors: # docker_registry_mirrors:
# - https://registry.docker-cn.com # - https://registry.docker-cn.com
# - https://mirror.aliyuncs.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. ## 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 insecure_registries is defined -%} {%- if docker_insecure_registries is defined -%}
{{ insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} {{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
{% if registry_mirrors is defined -%} {% if docker_registry_mirrors is defined -%}
{{ registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}