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

Fixing mandatory check of docker_version that breaks bastion host (#4395)

Browse source
This commit is contained in:
Prabal Deb 2019-04-11 17:26:10 +05:30 committed by Kubernetes Prow Robot
parent 6f97687d19
commit ec974e16fa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubespray-defaults/defaults/main.yaml
View file

@ -213,7 +213,7 @@ docker_options: >-
{% if docker_registry_mirrors is defined %} {% if docker_registry_mirrors is defined %}
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }} {{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
{%- if docker_version is version('17.05', '<') %} {%- if docker_version is defined and docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else %} {%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }} --data-root={{ docker_daemon_graph }} {{ docker_log_opts }}