Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
f557b544
Commit
f557b544
authored
6 years ago
by
rongzhang
Browse files
Options
Downloads
Patches
Plain Diff
Add `docker_` to values
parent
51794e4c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
inventory/sample/group_vars/all/docker.yml
+6
-6
6 additions, 6 deletions
inventory/sample/group_vars/all/docker.yml
roles/kubespray-defaults/defaults/main.yaml
+6
-6
6 additions, 6 deletions
roles/kubespray-defaults/defaults/main.yaml
with
12 additions
and
12 deletions
inventory/sample/group_vars/all/docker.yml
+
6
−
6
View file @
f557b544
...
@@ -28,12 +28,12 @@ docker_bin_dir: "/usr/bin"
...
@@ -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"
...
@@ -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" %}
...
...
This diff is collapsed.
Click to expand it.
roles/kubespray-defaults/defaults/main.yaml
+
6
−
6
View file @
f557b544
...
@@ -169,12 +169,12 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5"
...
@@ -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"
...
@@ -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" %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment