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 adaccb4 Tidy up docker variables in ansible (#2504)
adaccb4 is described below
commit adaccb479af594f869217ab9bdb6837e260af41c
Author: Christian Bickel <git...@cbickel.de>
AuthorDate: Wed Jul 19 08:41:53 2017 +0200
Tidy up docker variables in ansible (#2504)
---
ansible/group_vars/all | 8 ++++++--
ansible/roles/apigateway/tasks/deploy.yml | 3 ++-
ansible/roles/consul/tasks/clean.yml | 2 +-
ansible/roles/consul/tasks/deploy.yml | 3 ++-
ansible/roles/controller/tasks/clean.yml | 4 ++--
ansible/roles/controller/tasks/deploy.yml | 11 ++++++-----
ansible/roles/couchdb/tasks/deploy.yml | 3 ++-
ansible/roles/invoker/tasks/clean.yml | 2 +-
ansible/roles/invoker/tasks/deploy.yml | 25 ++++++++++++++-----------
ansible/roles/kafka/tasks/clean.yml | 4 ++--
ansible/roles/kafka/tasks/deploy.yml | 7 ++++---
ansible/roles/nginx/tasks/deploy.yml | 3 ++-
ansible/roles/redis/tasks/deploy.yml | 3 ++-
ansible/roles/registry/tasks/deploy.yml | 3 ++-
ansible/templates/whisk.properties.j2 | 6 +++---
15 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 91e3fa7..18512b1 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -204,17 +204,21 @@ linux:
couchdb:
version: 1.6
-docker_image_prefix: whisk
-docker_image_tag: latest
docker:
# The user to install docker for. Defaults to the ansible user if not set.
This will be the user who is able to run
# docker commands on a machine setup with prereq_build.yml
#user:
+ image:
+ prefix: "{{ docker_image_prefix | default('whisk') }}"
+ tag: "{{ docker_image_tag | default('latest') }}"
version: 1.12.0-0~trusty
storagedriver: overlay
port: 4243
restart:
policy: always
+ pull:
+ retries: 10
+ delay: 10
cli:
path: "{{ openwhisk_home }}/bin/wsk"
diff --git a/ansible/roles/apigateway/tasks/deploy.yml
b/ansible/roles/apigateway/tasks/deploy.yml
index 9d18488..f8d032d 100644
--- a/ansible/roles/apigateway/tasks/deploy.yml
+++ b/ansible/roles/apigateway/tasks/deploy.yml
@@ -4,7 +4,8 @@
- name: "pull the openwhisk/apigateway:{{ apigateway.version }} image"
shell: "docker pull openwhisk/apigateway:{{ apigateway.version }}"
when: apigateway_local_build is undefined
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
#temporary pinned to image 0.7.0 until apigateway fixes regressions
- name: (re)start apigateway
diff --git a/ansible/roles/consul/tasks/clean.yml
b/ansible/roles/consul/tasks/clean.yml
index 788c823..d8dc72a 100644
--- a/ansible/roles/consul/tasks/clean.yml
+++ b/ansible/roles/consul/tasks/clean.yml
@@ -11,7 +11,7 @@
- name: remove consul
docker_container:
name: consul
- image: "{{ docker_registry }}{{ docker_image_prefix }}/consul:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/consul:{{
docker.image.tag }}"
state: absent
ignore_errors: True
diff --git a/ansible/roles/consul/tasks/deploy.yml
b/ansible/roles/consul/tasks/deploy.yml
index ec8f372..8a1283f 100644
--- a/ansible/roles/consul/tasks/deploy.yml
+++ b/ansible/roles/consul/tasks/deploy.yml
@@ -26,7 +26,8 @@
- name: "pull the consul:{{ consul.version }} image"
shell: "docker pull consul:{{ consul.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: (re)start consul server/agent
docker_container:
diff --git a/ansible/roles/controller/tasks/clean.yml
b/ansible/roles/controller/tasks/clean.yml
index 24910f6..2850756 100644
--- a/ansible/roles/controller/tasks/clean.yml
+++ b/ansible/roles/controller/tasks/clean.yml
@@ -4,7 +4,7 @@
- name: remove controller
docker_container:
name: "controller{{ groups['controllers'].index(inventory_hostname) }}"
- image: "{{ docker_registry }}{{ docker_image_prefix }}/controller:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/controller:{{
docker.image.tag }}"
state: absent
ignore_errors: True
@@ -18,7 +18,7 @@
- name: remove controller
docker_container:
name: controller
- image: "{{ docker_registry }}{{ docker_image_prefix }}/controller:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/controller:{{
docker.image.tag }}"
state: absent
ignore_errors: True
diff --git a/ansible/roles/controller/tasks/deploy.yml
b/ansible/roles/controller/tasks/deploy.yml
index e9b91ca..a663689 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -3,10 +3,11 @@
- include: docker_login.yml
-- name: "pull the {{ docker_image_tag }} image of controller"
- shell: "docker pull {{ docker_registry }}{{ docker_image_prefix
}}/controller:{{ docker_image_tag }}"
+- 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
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: ensure controller log directory is created with permissions
file:
@@ -18,7 +19,7 @@
- name: (re)start controller
docker_container:
name: controller{{ groups['controllers'].index(inventory_hostname) }}
- image: "{{ docker_registry }}{{ docker_image_prefix }}/controller:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/controller:{{
docker.image.tag }}"
state: started
recreate: true
restart_policy: "{{ docker.restart.policy }}"
@@ -30,7 +31,7 @@
"PORT": 8080
"WHISK_VERSION_NAME": "{{ whisk_version_name }}"
"WHISK_VERSION_DATE": "{{ whisk.version.date }}"
- "WHISK_VERSION_BUILDNO": "{{ docker_image_tag }}"
+ "WHISK_VERSION_BUILDNO": "{{ docker.image.tag }}"
"SERVICE_CHECK_HTTP": "/ping"
"SERVICE_CHECK_TIMEOUT": "2s"
"SERVICE_CHECK_INTERVAL": "15s"
diff --git a/ansible/roles/couchdb/tasks/deploy.yml
b/ansible/roles/couchdb/tasks/deploy.yml
index c65dc9d..6e4d4bb 100644
--- a/ansible/roles/couchdb/tasks/deploy.yml
+++ b/ansible/roles/couchdb/tasks/deploy.yml
@@ -17,7 +17,8 @@
- name: "pull the couchdb:{{ couchdb.version }} image"
shell: "docker pull couchdb:{{ couchdb.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: (re)start CouchDB
docker_container:
diff --git a/ansible/roles/invoker/tasks/clean.yml
b/ansible/roles/invoker/tasks/clean.yml
index 096576e..12b503f 100644
--- a/ansible/roles/invoker/tasks/clean.yml
+++ b/ansible/roles/invoker/tasks/clean.yml
@@ -4,7 +4,7 @@
- name: remove invoker
docker_container:
name: "invoker{{ groups['invokers'].index(inventory_hostname) }}"
- image: "{{ docker_registry }}{{ docker_image_prefix }}/invoker:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/invoker:{{
docker.image.tag }}"
state: absent
stop_timeout: 60
timeout: 120
diff --git a/ansible/roles/invoker/tasks/deploy.yml
b/ansible/roles/invoker/tasks/deploy.yml
index 157f0ad..76a21d5 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -3,25 +3,28 @@
- include: docker_login.yml
-- name: "pull invoker image with tag {{docker_image_tag}}"
- shell: "docker pull {{docker_registry}}{{item}}:{{docker_image_tag}}"
+- name: "pull invoker image with tag {{docker.image.tag}}"
+ shell: "docker pull {{docker_registry}}{{item}}:{{docker.image.tag}}"
with_items:
- - '{{ docker_image_prefix }}/invoker'
+ - '{{ docker.image.prefix }}/invoker'
when: docker_registry != ""
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
-- name: "pull runtime action images with tag {{docker_image_tag}}"
- shell: "docker pull
{{docker_registry}}{{docker_image_prefix}}/{{item}}:{{docker_image_tag}}"
+- name: "pull runtime action images with tag {{docker.image.tag}}"
+ shell: "docker pull
{{docker_registry}}{{docker.image.prefix}}/{{item}}:{{docker.image.tag}}"
with_items: "{{ runtimesManifest.runtimes.values() | sum(start=[]) |
selectattr('deprecated', 'equalto',false) | map(attribute='image.name') | list
| unique }}"
when: docker_registry != ""
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
-- name: "pull blackboxes action images with tag {{docker_image_tag}}"
- shell: "docker pull
{{docker_registry}}{{docker_image_prefix}}/{{item.name}}:{{docker_image_tag}}"
+- name: "pull blackboxes action images with tag {{docker.image.tag}}"
+ shell: "docker pull
{{docker_registry}}{{docker.image.prefix}}/{{item.name}}:{{docker.image.tag}}"
with_items:
- "{{ runtimesManifest.blackboxes }}"
when: docker_registry != ""
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: determine docker root dir
uri: url="http://{{ inventory_hostname }}:{{ docker.port }}/info"
return_content=yes
@@ -79,7 +82,7 @@
-v {{ dockerInfo["json"]["DockerRootDir"] }}/containers/:/containers
-v {{ docker_sock | default('/var/run/docker.sock')
}}:/var/run/docker.sock
-p {{ invoker.port + groups['invokers'].index(inventory_hostname)
}}:8080
- {{ docker_registry }}{{ docker_image_prefix }}/invoker:{{
docker_image_tag }}
+ {{ docker_registry }}{{ docker.image.prefix }}/invoker:{{
docker.image.tag }}
/bin/sh -c "exec /invoker/bin/invoker {{
groups['invokers'].index(inventory_hostname) }} >> /logs/invoker{{
groups['invokers'].index(inventory_hostname) }}_logs.log 2>&1"
when: invokerInfo.json|length == 0
diff --git a/ansible/roles/kafka/tasks/clean.yml
b/ansible/roles/kafka/tasks/clean.yml
index 3c2b350..fa1db75 100644
--- a/ansible/roles/kafka/tasks/clean.yml
+++ b/ansible/roles/kafka/tasks/clean.yml
@@ -4,7 +4,7 @@
- name: remove kafka
docker_container:
name: kafka
- image: "{{ docker_registry }}{{ docker_image_prefix }}/kafka:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/kafka:{{
docker.image.tag }}"
keep_volumes: False
state: absent
ignore_errors: True
@@ -12,7 +12,7 @@
- name: remove zookeeper
docker_container:
name: zookeeper
- image: "{{ docker_registry }}{{ docker_image_prefix }}/zookeeper:{{
docker_image_tag }}"
+ image: "{{ docker_registry }}{{ docker.image.prefix }}/zookeeper:{{
docker.image.tag }}"
keep_volumes: False
state: absent
ignore_errors: True
diff --git a/ansible/roles/kafka/tasks/deploy.yml
b/ansible/roles/kafka/tasks/deploy.yml
index 7c0cc6e..6af0911 100644
--- a/ansible/roles/kafka/tasks/deploy.yml
+++ b/ansible/roles/kafka/tasks/deploy.yml
@@ -3,7 +3,8 @@
- name: "pull the zookeeper:{{ zookeeper.version }} image"
shell: "docker pull zookeeper:{{ zookeeper.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: (re)start zookeeper
docker_container:
@@ -24,7 +25,8 @@
- name: "pull the ches/kafka:{{ kafka.version }} image"
shell: "docker pull ches/kafka:{{ kafka.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: (re)start kafka
docker_container:
@@ -67,4 +69,3 @@
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"
-
diff --git a/ansible/roles/nginx/tasks/deploy.yml
b/ansible/roles/nginx/tasks/deploy.yml
index 2ad4043..8fafa24 100644
--- a/ansible/roles/nginx/tasks/deploy.yml
+++ b/ansible/roles/nginx/tasks/deploy.yml
@@ -34,7 +34,8 @@
- name: "pull the nginx:{{ nginx.version }} image"
shell: "docker pull nginx:{{ nginx.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: (re)start nginx
docker_container:
diff --git a/ansible/roles/redis/tasks/deploy.yml
b/ansible/roles/redis/tasks/deploy.yml
index f9dc06c..2dcfdb3 100644
--- a/ansible/roles/redis/tasks/deploy.yml
+++ b/ansible/roles/redis/tasks/deploy.yml
@@ -3,7 +3,8 @@
- name: "pull the redis:{{ redis.version }} image"
shell: "docker pull redis:{{ redis.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: (re)start redis
docker_container:
diff --git a/ansible/roles/registry/tasks/deploy.yml
b/ansible/roles/registry/tasks/deploy.yml
index 37849ff..c15f38d 100644
--- a/ansible/roles/registry/tasks/deploy.yml
+++ b/ansible/roles/registry/tasks/deploy.yml
@@ -3,7 +3,8 @@
- name: "pull the {{ registry.version }} image of registry"
shell: "docker pull registry:{{ registry.version }}"
- retries: 3
+ retries: "{{ docker.pull.retries }}"
+ delay: "{{ docker.pull.delay }}"
- name: "create {{ registry.confdir }} on registry {{ inventory_hostname }}"
file:
diff --git a/ansible/templates/whisk.properties.j2
b/ansible/templates/whisk.properties.j2
index af444f3..ac65f3a 100644
--- a/ansible/templates/whisk.properties.j2
+++ b/ansible/templates/whisk.properties.j2
@@ -9,7 +9,7 @@ vcap.services.file=
whisk.logs.dir={{ whisk_logs_dir }}
whisk.version.name={{ whisk_version_name }}
whisk.version.date={{ whisk.version.date }}
-whisk.version.buildno={{ docker_image_tag }}
+whisk.version.buildno={{ docker.image.tag }}
whisk.ssl.cert={{ nginx.ssl.path }}/{{ nginx.ssl.cert }}
whisk.ssl.key={{ nginx.ssl.path }}/{{ nginx.ssl.key }}
whisk.ssl.challenge=openwhisk
@@ -82,11 +82,11 @@ kafka.docker.endpoint={{ groups["kafka"]|first }}:{{
docker.port }}
main.docker.endpoint={{ groups["controllers"]|first }}:{{ docker.port }}
docker.registry={{ docker_registry }}
-docker.image.prefix={{ docker_image_prefix }}
+docker.image.prefix={{ docker.image.prefix }}
#use.docker.registry=false
docker.port={{ docker.port }}
docker.timezone.mount=
-docker.image.tag={{ docker_image_tag }}
+docker.image.tag={{ docker.image.tag }}
docker.tls.cmd=
docker.addHost.cmd=
docker.dns.cmd={{ docker_dns }}
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].
