From 551317f1cd08d59b6bfd608d03ae725a6d9713d3 Mon Sep 17 00:00:00 2001 From: Erwan Miran Date: Tue, 27 Nov 2018 16:13:15 +0100 Subject: [PATCH] Fix docker_options jinja syntax (#3770) --- inventory/sample/group_vars/all/docker.yml | 8 ++++---- roles/kubespray-defaults/defaults/main.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inventory/sample/group_vars/all/docker.yml b/inventory/sample/group_vars/all/docker.yml index 4e423b7a5..eeb219b58 100644 --- a/inventory/sample/group_vars/all/docker.yml +++ b/inventory/sample/group_vars/all/docker.yml @@ -51,15 +51,15 @@ docker_rpm_keepcache: 0 ## A string of extra options to pass to the docker daemon. ## This string should be exactly as you wish it to appear. 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(' ') }} {%- endif %} - {% if docker_registry_mirrors is defined -%} + {% if docker_registry_mirrors is defined %} {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {%- endif %} - {%- if docker_version is version('17.05', '<') -%} + {%- if docker_version is version('17.05', '<') %} --graph={{ docker_daemon_graph }} {{ docker_log_opts }} - {%- else -%} + {%- else %} --data-root={{ docker_daemon_graph }} {{ docker_log_opts }} {%- endif %} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index d0067c4dc..7446cb93c 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -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. ## This string should be exactly as you wish it to appear. 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(' ') }} {%- endif %} - {% if docker_registry_mirrors is defined -%} + {% if docker_registry_mirrors is defined %} {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {%- endif %} - {%- if docker_version is version('17.05', '<') -%} + {%- if docker_version is version('17.05', '<') %} --graph={{ docker_daemon_graph }} {{ docker_log_opts }} - {%- else -%} + {%- else %} --data-root={{ docker_daemon_graph }} {{ docker_log_opts }} {%- endif %} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}