Docker image pull retry

This change sets a default timeout of 300s for the image pull. If the
image pull times out (300s), we will retry 3 times by default.

fixes 1954

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 462ce1a92c532232f6a7b75ecd7ce61e89e22d07..f86fd2326c2e17f68d9e0e12c6260ad3ba6456c9 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -495,3 +495,8 @@ dummy:
 #rolling_update: false
 
 
+#####################
+# Docker pull retry #
+#####################
+#docker_pull_retry: 3
+#docker_pull_timeout: "300s"

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 6753a6501a25a8c30d13d8d9af5dbafddee215c8..17f3c7ca9a52b2b5169ec0ca8a15945c5357ca31 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -495,3 +495,8 @@ ceph_repository: rhcs
 #rolling_update: false
 
 
+#####################
+# Docker pull retry #
+#####################
+#docker_pull_retry: 3
+#docker_pull_timeout: "300s"

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 2c9a126471ca42c67c982db7810ceabbb22a0339..6af0ee68194461b9545b53958b0ffdefbcba1a5e 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -486,3 +486,8 @@ kv_port: 2379
 # do not ever change this here
 rolling_update: false
 
+#####################
+# Docker pull retry #
+#####################
+docker_pull_retry: 3
+docker_pull_timeout: "300s"

diff --git a/roles/ceph-docker-common/tasks/fetch_image.yml b/roles/ceph-docker-common/tasks/fetch_image.yml
index 69ba821fd5246ef7f091e97eadfe1d71637f4bd8..ad21ff9f56059af9c7713053d74ac1d8e353162e 100644 (file)
--- a/roles/ceph-docker-common/tasks/fetch_image.yml
+++ b/roles/ceph-docker-common/tasks/fetch_image.yml
@@ -1,8 +1,12 @@
 ---
 # Normal case - pull image from registry
 - name: "pull {{ ceph_docker_image }} image"
-  command: "docker pull {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
+  command: "timeout {{ docker_pull_timeout }} docker pull {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
   changed_when: false
+  register: docker_image
+  until: docker_image.rc == 0
+  retries: "{{ docker_pull_retry }}"
+  delay: 10
   when:
     - (ceph_docker_dev_image is undefined or not ceph_docker_dev_image)