[incubator-openwhisk] branch master updated: Add retries to all docker pull commands in ansible (#2400)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a87fbb  Add retries to all docker pull commands in ansible (#2400)
6a87fbb is described below

commit 6a87fbb1bd41d21c66e52d987127b49ef5c12e59
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Tue Jun 20 10:35:00 2017 +0200

    Add retries to all docker pull commands in ansible (#2400)
---
 ansible/roles/apigateway/tasks/deploy.yml | 1 +
 ansible/roles/cli/tasks/deploy.yml        | 1 +
 ansible/roles/consul/tasks/deploy.yml     | 1 +
 ansible/roles/controller/tasks/deploy.yml | 1 +
 ansible/roles/couchdb/tasks/deploy.yml    | 1 +
 ansible/roles/invoker/tasks/deploy.yml    | 1 +
 ansible/roles/kafka/tasks/deploy.yml      | 4 +++-
 ansible/roles/nginx/tasks/deploy.yml      | 1 +
 ansible/roles/redis/tasks/deploy.yml      | 1 +
 ansible/roles/registry/tasks/deploy.yml   | 1 +
 10 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/apigateway/tasks/deploy.yml b/ansible/roles/apigateway/tasks/deploy.yml
index 4f95f5f..a2dd2be 100644
--- a/ansible/roles/apigateway/tasks/deploy.yml
+++ b/ansible/roles/apigateway/tasks/deploy.yml
@@ -4,6 +4,7 @@
 - name: "pull the openwhisk/apigateway image"
   shell: "docker pull openwhisk/apigateway:{{ apigateway.version }}"
   when: apigateway_local_build is undefined
+  retries: 3
 
 #temporary pinned to image 0.7.0 until apigateway fixes regressions
 - name: (re)start apigateway
diff --git a/ansible/roles/cli/tasks/deploy.yml b/ansible/roles/cli/tasks/deploy.yml
index 1bf872d..151f6a8 100644
--- a/ansible/roles/cli/tasks/deploy.yml
+++ b/ansible/roles/cli/tasks/deploy.yml
@@ -11,6 +11,7 @@
 - name: "pull the {{ docker_image_tag }} image of cli"
   shell: "docker pull {{ docker_registry }}{{ docker_image_prefix }}/cli:{{ docker_image_tag }}"
   when: docker_registry != ""
+  retries: 3
 
 - name: "run Docker"
   shell: "docker run --name cli {{ docker_registry }}{{ docker_image_prefix }}/cli:{{ docker_image_tag }}"
diff --git a/ansible/roles/consul/tasks/deploy.yml b/ansible/roles/consul/tasks/deploy.yml
index 2e20ee0..ec8f372 100644
--- a/ansible/roles/consul/tasks/deploy.yml
+++ b/ansible/roles/consul/tasks/deploy.yml
@@ -26,6 +26,7 @@
 
 - name: "pull the consul:{{ consul.version }} image"
   shell: "docker pull consul:{{ consul.version }}"
+  retries: 3
 
 - name: (re)start consul server/agent
   docker_container:
diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
index 04d5aa1..9dfbae4 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -6,6 +6,7 @@
 - name: "pull the {{ docker_image_tag }} image of controller"
   shell: "docker pull {{ docker_registry }}{{ docker_image_prefix }}/controller:{{ docker_image_tag }}"
   when: docker_registry != ""
+  retries: 3
 
 - name: ensure controller log directory is created with permissions
   file:
diff --git a/ansible/roles/couchdb/tasks/deploy.yml b/ansible/roles/couchdb/tasks/deploy.yml
index 4acb811..c65dc9d 100644
--- a/ansible/roles/couchdb/tasks/deploy.yml
+++ b/ansible/roles/couchdb/tasks/deploy.yml
@@ -17,6 +17,7 @@
 
 - name: "pull the couchdb:{{ couchdb.version }} image"
   shell: "docker pull couchdb:{{ couchdb.version }}"
+  retries: 3
 
 - name: (re)start CouchDB
   docker_container:
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index bf5430c..58c2519 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -14,6 +14,7 @@
     - '{{ docker_image_prefix }}/swift3action'
     - '{{ docker_image_prefix }}/java8action'
   when: docker_registry != ""
+  retries: 3
 
 - name: determine docker root dir
   uri:  url="http://{{ inventory_hostname }}:{{ docker.port }}/info" return_content=yes
diff --git a/ansible/roles/kafka/tasks/deploy.yml b/ansible/roles/kafka/tasks/deploy.yml
index ba6cd92..ecccd59 100644
--- a/ansible/roles/kafka/tasks/deploy.yml
+++ b/ansible/roles/kafka/tasks/deploy.yml
@@ -3,6 +3,7 @@
 
 - name: "pull the zookeeper:{{ zookeeper.version }} image"
   shell: "docker pull zookeeper:{{ zookeeper.version }}"
+  retries: 3
 
 - name: (re)start zookeeper
   docker_container:
@@ -23,6 +24,7 @@
 
 - name: "pull the ches/kafka:{{ kafka.version }} image"
   shell: "docker pull ches/kafka:{{ kafka.version }}"
+  retries: 3
 
 - name: (re)start kafka
   docker_container:
@@ -59,4 +61,4 @@
   with_indexed_items: "{{ groups['invokers'] }}"
   register: command_result
   failed_when: "not ('Created topic' in command_result.stdout or 'already exists' in command_result.stdout)"
-  changed_when: "'Created topic' in command_result.stdout"
\ No newline at end of file
+  changed_when: "'Created topic' in command_result.stdout"
diff --git a/ansible/roles/nginx/tasks/deploy.yml b/ansible/roles/nginx/tasks/deploy.yml
index 6ad1f3a..2ad4043 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -34,6 +34,7 @@
 
 - name: "pull the nginx:{{ nginx.version }} image"
   shell: "docker pull nginx:{{ nginx.version }}"
+  retries: 3
 
 - name: (re)start nginx
   docker_container:
diff --git a/ansible/roles/redis/tasks/deploy.yml b/ansible/roles/redis/tasks/deploy.yml
index c85f331..f9dc06c 100644
--- a/ansible/roles/redis/tasks/deploy.yml
+++ b/ansible/roles/redis/tasks/deploy.yml
@@ -3,6 +3,7 @@
 
 - name: "pull the redis:{{ redis.version }} image"
   shell: "docker pull redis:{{ redis.version }}"
+  retries: 3
 
 - name: (re)start redis
   docker_container:
diff --git a/ansible/roles/registry/tasks/deploy.yml b/ansible/roles/registry/tasks/deploy.yml
index 9f392ca..37849ff 100644
--- a/ansible/roles/registry/tasks/deploy.yml
+++ b/ansible/roles/registry/tasks/deploy.yml
@@ -3,6 +3,7 @@
 
 - name: "pull the {{ registry.version }} image of registry"
   shell: "docker pull registry:{{ registry.version }}"
+  retries: 3
 
 - name: "create {{ registry.confdir }} on registry {{ inventory_hostname }}"
   file:

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].