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
551317f1
Commit
551317f1
authored
6 years ago
by
Erwan Miran
Committed by
k8s-ci-robot
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix docker_options jinja syntax (#3770)
parent
ddc19f43
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
+4
-4
4 additions, 4 deletions
inventory/sample/group_vars/all/docker.yml
roles/kubespray-defaults/defaults/main.yaml
+4
-4
4 additions, 4 deletions
roles/kubespray-defaults/defaults/main.yaml
with
8 additions
and
8 deletions
inventory/sample/group_vars/all/docker.yml
+
4
−
4
View file @
551317f1
...
@@ -51,15 +51,15 @@ docker_rpm_keepcache: 0
...
@@ -51,15 +51,15 @@ 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
-
%}
{%- if docker_insecure_registries is defined %}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %}
{%- endif %}
{% if docker_registry_mirrors is defined
-
%}
{% if docker_registry_mirrors is defined %}
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{%- endif %}
{%- endif %}
{%- if docker_version is version('17.05', '<')
-
%}
{%- if docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else
-
%}
{%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- endif %}
{%- endif %}
{%- 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
+
4
−
4
View file @
551317f1
...
@@ -207,15 +207,15 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5"
...
@@ -207,15 +207,15 @@ 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 docker_insecure_registries is defined
-
%}
{%- if docker_insecure_registries is defined %}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %}
{%- endif %}
{% if docker_registry_mirrors is defined
-
%}
{% if docker_registry_mirrors is defined %}
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{%- endif %}
{%- endif %}
{%- if docker_version is version('17.05', '<')
-
%}
{%- if docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else
-
%}
{%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- endif %}
{%- endif %}
{%- 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