You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ma...@apache.org on 2017/06/22 14:04:36 UTC
[incubator-openwhisk] branch master updated: Use hosts to define
order of invokers instead of play_hosts (#2412)
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 51d5169 Use hosts to define order of invokers instead of play_hosts (#2412)
51d5169 is described below
commit 51d5169eafb6f83be187cc102991a9dc7af6b1dc
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Thu Jun 22 16:04:27 2017 +0200
Use hosts to define order of invokers instead of play_hosts (#2412)
---
ansible/roles/invoker/tasks/clean.yml | 4 ++--
ansible/roles/invoker/tasks/deploy.yml | 29 +++++++++++++++--------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ansible/roles/invoker/tasks/clean.yml b/ansible/roles/invoker/tasks/clean.yml
index 4ab6783..096576e 100644
--- a/ansible/roles/invoker/tasks/clean.yml
+++ b/ansible/roles/invoker/tasks/clean.yml
@@ -3,7 +3,7 @@
- name: remove invoker
docker_container:
- name: "invoker{{play_hosts.index(inventory_hostname)}}"
+ name: "invoker{{ groups['invokers'].index(inventory_hostname) }}"
image: "{{ docker_registry }}{{ docker_image_prefix }}/invoker:{{ docker_image_tag }}"
state: absent
stop_timeout: 60
@@ -35,6 +35,6 @@
- name: remove invoker log directory
file:
- path: "{{ whisk_logs_dir }}/invoker{{play_hosts.index(inventory_hostname)}}"
+ path: "{{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}"
state: absent
become: true
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index 58c2519..73e32f7 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -3,8 +3,8 @@
- include: docker_login.yml
-- name: "pull action images with tag {{docker_image_tag}}"
- shell: "docker pull {{docker_registry}}{{item}}:{{docker_image_tag}}"
+- name: "pull action images with tag {{ docker_image_tag }}"
+ shell: "docker pull {{ docker_registry }}{{ item }}:{{ docker_image_tag }}"
with_items:
- '{{ docker_image_prefix }}/invoker'
- '{{ docker_image_prefix }}/dockerskeleton'
@@ -22,7 +22,7 @@
- name: ensure invoker log directory is created with permissions
file:
- path: "{{ whisk_logs_dir }}/invoker{{play_hosts.index(inventory_hostname)}}"
+ path: "{{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}"
state: directory
mode: 0777
become: true
@@ -41,9 +41,10 @@
when: invokerInfo.json|length > 1
- name: determine if index of invoker is same with index of inventory host
- fail: 'msg="invoker index is invalid. expected: /invoker{{play_hosts.index(inventory_hostname)}} found: {{item.Names[0]}}"'
+ fail:
+ msg: "invoker index is invalid. expected: /invoker{{ groups['invokers'].index(inventory_hostname) }} found: {{ item.Names[0] }}"
with_items: "{{ invokerInfo.json }}"
- when: item.Names[0] != "/invoker{{play_hosts.index(inventory_hostname)}}"
+ when: item.Names[0] != "/invoker{{ groups['invokers'].index(inventory_hostname) }}"
- name: start invoker using docker cli
shell: >
@@ -52,10 +53,10 @@
--pid=host
--privileged
{{ linuxOptions | default('') }}
- --name invoker{{play_hosts.index(inventory_hostname)}}
- --hostname invoker{{play_hosts.index(inventory_hostname)}}
+ --name invoker{{ groups['invokers'].index(inventory_hostname) }}
+ --hostname invoker{{ groups['invokers'].index(inventory_hostname) }}
--restart {{ docker.restart.policy }}
- -e COMPONENT_NAME=invoker{{play_hosts.index(inventory_hostname)}}
+ -e COMPONENT_NAME=invoker{{ groups['invokers'].index(inventory_hostname) }}
-e CONSULSERVER_HOST={{ groups['consul_servers'] | first }}
-e CONSUL_HOST_PORT4={{ consul.port.http }}
-e PORT=8080
@@ -67,19 +68,19 @@
-e INVOKER_OPTS={{ invoker.arguments }}
-v /sys/fs/cgroup:/sys/fs/cgroup
-v /run/runc:/run/runc
- -v {{whisk_logs_dir}}/invoker{{play_hosts.index(inventory_hostname)}}:/logs
- -v {{dockerInfo["json"]["DockerRootDir"]}}/containers/:/containers
+ -v {{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}:/logs
+ -v {{ dockerInfo["json"]["DockerRootDir"] }}/containers/:/containers
-v {{ docker_sock | default('/var/run/docker.sock') }}:/var/run/docker.sock
- -p {{invoker.port + play_hosts.index(inventory_hostname)}}:8080
- {{docker_registry}}{{ docker_image_prefix }}/invoker:{{docker_image_tag}}
- /bin/sh -c "exec /invoker/bin/invoker {{play_hosts.index(inventory_hostname)}} >> /logs/invoker{{play_hosts.index(inventory_hostname)}}_logs.log 2>&1"
+ -p {{ invoker.port + groups['invokers'].index(inventory_hostname) }}:8080
+ {{ 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
# todo: re-enable docker_container module once https://github.com/ansible/ansible-modules-core/issues/5054 is resolved
- name: wait until Invoker is up and running
uri:
- url: "http://{{ inventory_hostname }}:{{invoker.port + play_hosts.index(inventory_hostname)}}/ping"
+ url: "http://{{ inventory_hostname }}:{{ invoker.port + groups['invokers'].index(inventory_hostname) }}/ping"
register: result
until: result.status == 200
retries: 12
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].