Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BD1D2200CD7 for ; Tue, 1 Aug 2017 11:36:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BB82D166D55; Tue, 1 Aug 2017 09:36:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0D8F4166D4A for ; Tue, 1 Aug 2017 11:36:39 +0200 (CEST) Received: (qmail 71237 invoked by uid 500); 1 Aug 2017 09:36:39 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 71223 invoked by uid 99); 1 Aug 2017 09:36:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Aug 2017 09:36:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 759218119F; Tue, 1 Aug 2017 09:36:34 +0000 (UTC) Date: Tue, 01 Aug 2017 09:36:34 +0000 To: "commits@openwhisk.apache.org" Subject: [incubator-openwhisk] branch master updated: Escape all values when deploying invoker (#2550) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150158019475.30613.7426687257886140585@gitbox.apache.org> From: cbickel@apache.org Reply-To: "commits@openwhisk.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-openwhisk X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e466e48a8cb7bf44b358e38728f58360b8377f7e X-Git-Newrev: 9e55e5b99064066c6e9c4142a7cee04cb5446cbe X-Git-Rev: 9e55e5b99064066c6e9c4142a7cee04cb5446cbe X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Tue, 01 Aug 2017 09:36:40 -0000 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 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" '].