Browse Source

Merge pull request #3217 from mirwan/fix_3215

Fix docker_options definition to remove newlines
pull/3219/head
k8s-ci-robot 6 years ago
committed by GitHub
parent
commit
64b32146ca
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
  1. 6
      inventory/sample/group_vars/k8s-cluster.yml

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

@ -150,13 +150,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.

Loading…
Cancel
Save