You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cb...@apache.org on 2017/08/01 09:36:34 UTC
[incubator-openwhisk] branch master updated: Escape all values when
deploying invoker (#2550)
This is an automated email from the ASF dual-hosted git repository.
cbickel 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 9e55e5b Escape all values when deploying invoker (#2550)
9e55e5b is described below
commit 9e55e5b99064066c6e9c4142a7cee04cb5446cbe
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Tue Aug 1 11:36:32 2017 +0200
Escape all values when deploying invoker (#2550)
---
ansible/roles/invoker/tasks/deploy.yml | 60 +++++++++++++++++-----------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index 5c67aa2..3fc828a 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -66,38 +66,38 @@
--name invoker{{ groups['invokers'].index(inventory_hostname) }}
--hostname invoker{{ groups['invokers'].index(inventory_hostname) }}
--restart {{ docker.restart.policy }}
- -e JAVA_OPTS=-Xmx{{ invoker.heap }}
+ -e JAVA_OPTS='-Xmx{{ invoker.heap }}'
-e INVOKER_OPTS='{{ invoker.arguments }}'
- -e COMPONENT_NAME=invoker{{ groups['invokers'].index(inventory_hostname) }}
- -e PORT=8080
- -e KAFKA_HOST={{ groups['kafka']|first }}
- -e KAFKA_HOST_PORT={{ kafka.port }}
- -e DB_PROTOCOL={{ db_protocol }}
- -e DB_PROVIDER={{ db_provider }}
- -e DB_HOST={{ db_host }}
- -e DB_PORT={{ db_port }}
- -e DB_USERNAME={{ db_username }}
- -e DB_PASSWORD={{ db_password }}
- -e DB_WHISK_ACTIONS={{ db.whisk.actions }}
- -e DB_WHISK_ACTIVATIONS={{ db.whisk.activations }}
- -e WHISK_API_HOST_PROTO={{ whisk_api_host_proto | default('https') }}
- -e WHISK_API_HOST_PORT={{ whisk_api_host_port | default('443') }}
- -e WHISK_API_HOST_NAME={{ whisk_api_host_name | default(groups['edge'] | first) }}
+ -e COMPONENT_NAME='invoker{{ groups['invokers'].index(inventory_hostname) }}'
+ -e PORT='8080'
+ -e KAFKA_HOST='{{ groups['kafka']|first }}'
+ -e KAFKA_HOST_PORT='{{ kafka.port }}'
+ -e DB_PROTOCOL='{{ db_protocol }}'
+ -e DB_PROVIDER='{{ db_provider }}'
+ -e DB_HOST='{{ db_host }}'
+ -e DB_PORT='{{ db_port }}'
+ -e DB_USERNAME='{{ db_username }}'
+ -e DB_PASSWORD='{{ db_password }}'
+ -e DB_WHISK_ACTIONS='{{ db.whisk.actions }}'
+ -e DB_WHISK_ACTIVATIONS='{{ db.whisk.activations }}'
+ -e WHISK_API_HOST_PROTO='{{ whisk_api_host_proto | default('https') }}'
+ -e WHISK_API_HOST_PORT='{{ whisk_api_host_port | default('443') }}'
+ -e WHISK_API_HOST_NAME='{{ whisk_api_host_name | default(groups['edge'] | first) }}'
-e RUNTIMES_MANIFEST='{{ runtimesManifest | to_json }}'
- -e SELF_DOCKER_ENDPOINT=localhost
- -e DOCKER_REGISTRY={{ docker_registry }}
- -e DOCKER_IMAGE_PREFIX={{ docker.image.prefix }}
- -e DOCKER_IMAGE_TAG={{ docker.image.tag }}
- -e INVOKER_CONTAINER_NETWORK={{ invoker_container_network_name | default("bridge") }}
- -e INVOKER_CONTAINER_POLICY={{ invoker_container_policy_name | default()}}
- -e INVOKER_CONTAINER_DNS={{ invoker_container_network_dns_servers | default()}}
- -e INVOKER_NUMCORE={{ invoker.numcore }}
- -e INVOKER_CORESHARE={{ invoker.coreshare }}
- -e INVOKER_SERIALIZEDOCKEROP={{ invoker.serializeDockerOp }}
- -e INVOKER_SERIALIZEDOCKERPULL={{ invoker.serializeDockerPull }}
- -e INVOKER_USERUNC={{ invoker_use_runc | default(invoker.useRunc) }}
- -e INVOKER_USEREACTIVEPOOL={{ invoker.useReactivePool }}
- -e WHISK_LOGS_DIR={{ whisk_logs_dir }}
+ -e SELF_DOCKER_ENDPOINT='localhost'
+ -e DOCKER_REGISTRY='{{ docker_registry }}'
+ -e DOCKER_IMAGE_PREFIX='{{ docker.image.prefix }}'
+ -e DOCKER_IMAGE_TAG='{{ docker.image.tag }}'
+ -e INVOKER_CONTAINER_NETWORK='{{ invoker_container_network_name | default("bridge") }}'
+ -e INVOKER_CONTAINER_POLICY='{{ invoker_container_policy_name | default()}}'
+ -e INVOKER_CONTAINER_DNS='{{ invoker_container_network_dns_servers | default()}}'
+ -e INVOKER_NUMCORE='{{ invoker.numcore }}'
+ -e INVOKER_CORESHARE='{{ invoker.coreshare }}'
+ -e INVOKER_SERIALIZEDOCKEROP='{{ invoker.serializeDockerOp }}'
+ -e INVOKER_SERIALIZEDOCKERPULL='{{ invoker.serializeDockerPull }}'
+ -e INVOKER_USERUNC='{{ invoker_use_runc | default(invoker.useRunc) }}'
+ -e INVOKER_USEREACTIVEPOOL='{{ invoker.useReactivePool }}'
+ -e WHISK_LOGS_DIR='{{ whisk_logs_dir }}'
-v /sys/fs/cgroup:/sys/fs/cgroup
-v /run/runc:/run/runc
-v {{ whisk_logs_dir }}/invoker{{ groups['invokers'].index(inventory_hostname) }}:/logs
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].