Fix docker_options jinja syntax (#3770)

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

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