[openwhisk] branch master updated: Add ansible deploy options (#4619)

[rabbah]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f946878  Add ansible deploy options (#4619)
f946878 is described below

commit f946878cf3acf238692805457a87fc806d78f727
Author: Bill Zong <billzong2...@gmail.com>
AuthorDate: Mon Sep 16 17:21:25 2019 +0800

    Add ansible deploy options (#4619)
    
    * add docker image pull option for kafka ansible deployment
    
    * add docker image pull option for zookeeper ansible deployment and remove 
mandatory pull task
---
 ansible/roles/kafka/tasks/deploy.yml     | 2 +-
 ansible/roles/zookeeper/tasks/deploy.yml | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/kafka/tasks/deploy.yml 
b/ansible/roles/kafka/tasks/deploy.yml
index 850baab..32f320f 100644
--- a/ansible/roles/kafka/tasks/deploy.yml
+++ b/ansible/roles/kafka/tasks/deploy.yml
@@ -99,7 +99,7 @@
       - "{{ kafka.advertisedPort + groups['kafkas'].index(inventory_hostname) 
}}:{{ kafka.advertisedPort + groups['kafkas'].index(inventory_hostname) }}"
     volumes:
       - "{{ config_root_dir }}/kafka/certs:/config"
-    pull: true
+    pull: "{{ kafka.pull_kafka | default(true) }}"
 
 - name: wait until the kafka server started up
   shell:
diff --git a/ansible/roles/zookeeper/tasks/deploy.yml 
b/ansible/roles/zookeeper/tasks/deploy.yml
index be9b125..260cd86 100644
--- a/ansible/roles/zookeeper/tasks/deploy.yml
+++ b/ansible/roles/zookeeper/tasks/deploy.yml
@@ -17,13 +17,6 @@
 ---
 # This role will install Kafka with Zookeeper in group 'kafka' in the 
environment inventory
 
-- name: "pull the zookeeper:{{ zookeeper.version }} image"
-  shell: "docker pull zookeeper:{{ zookeeper.version }}"
-  register: result
-  until: (result.rc == 0)
-  retries: "{{ docker.pull.retries }}"
-  delay: "{{ docker.pull.delay }}"
-
 - name: (re)start zookeeper
   docker_container:
     name: zookeeper{{ groups['zookeepers'].index(inventory_hostname) }}
@@ -47,6 +40,7 @@
       - "{{ zookeeper.port + groups['zookeepers'].index(inventory_hostname) 
}}:2181"
       - "{{ 2888 + groups['zookeepers'].index(inventory_hostname) }}:2888"
       - "{{ 3888 + groups['zookeepers'].index(inventory_hostname) }}:3888"
+    pull: "{{ zookeeper.pull_zookeeper | default(true) }}"
 
 - name: wait until the Zookeeper in this host is up and running
   action: shell (echo ruok; sleep 1) | nc {{ ansible_host }} {{ zookeeper.port 
+ groups['zookeepers'].index(inventory_hostname) }}