[GitHub] houshengbo closed pull request #793: Update the group variables in openwhisk wskdeploy

[GitBox <gi...@apache.org>]

houshengbo closed pull request #793: Update the group variables in openwhisk wskdeploy
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/793
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index 4df3c43c..b3700ff3 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -1,24 +1,11 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for additional
-# information regarding copyright ownership.  The ASF licenses this file to you
-# under the Apache License, Version 2.0 (the # "License"); you may not use this
-# file except in compliance with the License.  You may obtain a copy of the License
-# at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations under the License.
-#
-
 whisk_version_name: local
-config_root_dir: /tmp/wskconf
-whisk_logs_dir: /tmp/wsklogs
+openwhisk_tmp_dir: "{{ lookup('env', 'OPENWHISK_TMP_DIR')|default('/tmp', true) }}"
+config_root_dir: "{{ openwhisk_tmp_dir }}/wskconf"
+whisk_logs_dir: "{{ openwhisk_tmp_dir }}/wsklogs"
 docker_registry: ""
 docker_dns: ""
+runtimes_bypass_pull_for_local_images: true
+invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
 
 db_prefix: whisk_local_
 
@@ -35,12 +22,9 @@ apigw_auth_user: ""
 apigw_auth_pwd: ""
 apigw_host_v2: "http://{{ groups['apigateway']|first }}:{{apigateway.port.api}}/v2"
 
-controller_arguments: '-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098'
-invoker_arguments: "{{ controller_arguments }}"
-
 invoker_allow_multiple_instances: true
 
-# Set kafka topic retention
+# Set kafka configuration
 kafka_heap: '512m'
 kafka_topics_completed_retentionBytes: 104857600
 kafka_topics_completed_retentionMS: 300000
@@ -48,3 +32,5 @@ kafka_topics_health_retentionBytes: 104857600
 kafka_topics_health_retentionMS: 300000
 kafka_topics_invoker_retentionBytes: 104857600
 kafka_topics_invoker_retentionMS: 300000
+
+env_hosts_dir: "{{ playbook_dir }}/environments/local"
diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts
index 7b0fe4d9..f710bd6c 100644
--- a/ansible/environments/local/hosts
+++ b/ansible/environments/local/hosts
@@ -1,20 +1,3 @@
-;
-; Licensed to the Apache Software Foundation (ASF) under one or more contributor
-; license agreements.  See the NOTICE file distributed with this work for additional
-; information regarding copyright ownership.  The ASF licenses this file to you
-; under the Apache License, Version 2.0 (the # "License"); you may not use this
-; file except in compliance with the License.  You may obtain a copy of the License
-; at:
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software distributed
-; under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-; CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-; specific language governing permissions and limitations under the License.
-;
-; the first parameter in a host is the inventory_hostname
-
 ; used for local actions only
 ansible ansible_connection=local
 
@@ -23,15 +6,24 @@ ansible ansible_connection=local
 
 [controllers]
 controller0         ansible_host=172.17.0.1 ansible_connection=local
+;{% if mode is defined and 'HA' in mode %}
+;controller1         ansible_host=172.17.0.1 ansible_connection=local
+;{% endif %}
 
 [kafkas]
 kafka0              ansible_host=172.17.0.1 ansible_connection=local
+{% if mode is defined and 'HA' in mode %}
+kafka1              ansible_host=172.17.0.1 ansible_connection=local
+{% endif %}
 
 [zookeepers:children]
 kafkas
 
 [invokers]
 invoker0            ansible_host=172.17.0.1 ansible_connection=local
+{% if mode is defined and 'HA' in mode %}
+invoker1            ansible_host=172.17.0.1 ansible_connection=local
+{% endif %}
 
 ; db group is only used if db_provider is CouchDB
 [db]


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services