Browse Source

Fix docker_options definition when docker_version is 'latest' rather than a number (#3919)

- NOTE: it assumes that the 'latest' version is newer than 17.05
pull/3926/head
Hedayat Vatankhah (هدایت) 6 years ago
committed by Kubernetes Prow Robot
parent
commit
fbe9e0ac1a
2 changed files with 2 additions and 2 deletions
  1. 2
      inventory/sample/group_vars/all/docker.yml
  2. 2
      roles/kubespray-defaults/defaults/main.yaml

2
inventory/sample/group_vars/all/docker.yml

@ -57,7 +57,7 @@ docker_options: >-
{% 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 != "latest" and docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}

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

@ -216,7 +216,7 @@ docker_options: >-
{% 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 != "latest" and docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}

Loading…
Cancel
Save