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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
feac8024
Commit
feac8024
authored
5 years ago
by
Johannes Scheuermann
Committed by
Kubernetes Prow Robot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove default docker_options from sample (#5287)
parent
076f254a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
inventory/sample/group_vars/all/docker.yml
+1
-17
1 addition, 17 deletions
inventory/sample/group_vars/all/docker.yml
with
1 addition
and
17 deletions
inventory/sample/group_vars/all/docker.yml
+
1
−
17
View file @
feac8024
...
@@ -42,7 +42,7 @@ docker_rpm_keepcache: 0
...
@@ -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 Moun
t
Flags 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
...
@@ -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 -%}
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