From 36a7bdfac1224bc2f9c626d1bf8422f0ecbd55b1 Mon Sep 17 00:00:00 2001 From: Erwan Miran Date: Sat, 1 Sep 2018 09:55:04 +0200 Subject: [PATCH] Fix docker_options definition to remove newlines --- inventory/sample/group_vars/k8s-cluster.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/sample/group_vars/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster.yml index aa0210ebd..f4612b92a 100644 --- a/inventory/sample/group_vars/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s-cluster.yml @@ -146,13 +146,13 @@ docker_daemon_graph: "/var/lib/docker" ## An obvious use case is allowing insecure-registry access ## to self hosted registries like so: -docker_options: > +docker_options: >- --insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }} - {% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} + {%- 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 %} + {%- endif -%} docker_bin_dir: "/usr/bin" ## If non-empty will override default system MounFlags value.