bump rpm based docker versions to docker-ce-18.06.3.ce-3 (#4925 )

Update ansible version (#4883 )
Fixing mandatory check of docker_version that breaks bastion host (#4395 )
2026-02-02 10:08:13 -03:30 · 2019-07-08 05:52:35 -07:00 · 2019-06-14 01:22:21 -07:00 · 2019-04-11 04:56:10 -07:00
4 changed files with 5 additions and 5 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-ansible>=2.5.0,!=2.7.0
+ansible>=2.5.0,<2.7
 jinja2>=2.9.6
 netaddr
 pbr>=1.6
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -6,7 +6,7 @@ docker_kernel_min_version: '0'
 docker_versioned_pkg:
  'latest': docker-ce
  '18.03': docker-ce-18.03.1.ce-3.fc28
-  '18.06': docker-ce-18.06.2.ce-3.fc28
+  '18.06': docker-ce-18.06.3.ce-3.fc28

 #
 # This is due to the fact that the docker
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/roles/container-engine/docker/vars/redhat.yml
@@ -14,8 +14,8 @@ docker_versioned_pkg:
  '17.09': docker-ce-17.09.0.ce-1.el7.centos
  '17.12': docker-ce-17.12.1.ce-1.el7.centos
  '18.03': docker-ce-18.03.1.ce-1.el7.centos
-  '18.06': docker-ce-18.06.2.ce-3.el7
-  'stable': docker-ce-18.06.2.ce-3.el7
+  '18.06': docker-ce-18.06.3.ce-3.el7
+  'stable': docker-ce-18.06.3.ce-3.el7
  'edge': docker-ce-17.12.1.ce-1.el7.centos

 docker_selinux_versioned_pkg:
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -213,7 +213,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 is defined and docker_version is version('17.05', '<') %}
  --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
  {%- else %}
  --data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
Author	SHA1	Message	Date
awalker125	d3f6079991	bump rpm based docker versions to docker-ce-18.06.3.ce-3 (#4925 )	2019-07-08 05:52:35 -07:00
Mateus Caruccio	7aa8b82512	Update ansible version (#4883 )	2019-06-14 01:22:21 -07:00
Prabal Deb	ec974e16fa	Fixing mandatory check of docker_version that breaks bastion host (#4395 )	2019-04-11 04:56:10 -07:00