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

(cherry picked from commit ab587642885f1f518fe14ee7f1c7fc8cbbbf29f0)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 14ba14dec6ec4e57284e9525eef507d77d599baa..2a75fa6bb1abe4a0878d080162270159b7beb92d 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -498,3 +498,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 b12eca098b72be89c937b3e2edceb64439995913..f95d195b261f5d2c27146570c7f45e3f9786b483 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -498,3 +498,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 57a90c72280dace7bd5840098a7a2278dcc6c577..0721f5bb5d9680220df90e75eb17e1b96b8426ba 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -489,3 +489,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..5cbe676684729025d5eca91cc3216bb63f980783 100644 (file)
--- a/roles/ceph-docker-common/tasks/fetch_image.yml
+++ b/roles/ceph-docker-common/tasks/fetch_image.yml
@@ -3,6 +3,10 @@
 - name: "pull {{ ceph_docker_image }} image"
   command: "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)