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

Fix docker_options jinja syntax (#3770)

Browse source
This commit is contained in:
Erwan Miran 2018-11-27 16:13:15 +01:00 committed by k8s-ci-robot
parent ddc19f43ba
commit 551317f1cd
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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" %}

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

@ -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" %}