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

Fix docker_options definition to remove newlines

Browse source
This commit is contained in:
Erwan Miran 2018-09-01 09:55:04 +02:00
parent 7efe287c74
commit 36a7bdfac1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
inventory/sample/group_vars/k8s-cluster.yml
View file

@ -146,13 +146,13 @@ docker_daemon_graph: "/var/lib/docker"
## An obvious use case is allowing insecure-registry access ## An obvious use case is allowing insecure-registry access
## to self hosted registries like so: ## to self hosted registries like so:
docker_options: > docker_options: >-
--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }} --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 --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd --default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
--userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false --userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false
{% endif %} {%- endif -%}
docker_bin_dir: "/usr/bin" docker_bin_dir: "/usr/bin"
## If non-empty will override default system MounFlags value. ## If non-empty will override default system MounFlags value.