You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/01/27 13:02:07 UTC
[GitHub] rabbah closed pull request #11: fix travis build
rabbah closed pull request #11: fix travis build
URL: https://github.com/apache/incubator-openwhisk-runtime-docker/pull/11
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 3ba8955..9979c20 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -1,8 +1,9 @@
whisk_version_name: local
-config_root_dir: /tmp
+config_root_dir: /tmp/wskconf
whisk_logs_dir: /tmp/wsklogs
docker_registry: ""
docker_dns: ""
+bypass_pull_for_local_images: true
db_prefix: whisk_local_
@@ -19,11 +20,19 @@ 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 configuration
+kafka_heap: '512m'
+kafka_topics_completed_retentionBytes: 104857600
+kafka_topics_completed_retentionMS: 300000
+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"
+
runtimes_manifest:
defaultImagePrefix: "openwhisk"
defaultImageTag: "latest"
@@ -35,4 +44,4 @@ runtimes_manifest:
name: "nodejs6action"
deprecated: false
blackboxes:
- - name: "dockerskeleton"
+ - name: "dockerskeleton"
\ No newline at end of file
diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts
index c99f195..4715e55 100644
--- a/ansible/environments/local/hosts
+++ b/ansible/environments/local/hosts
@@ -9,8 +9,11 @@ ansible ansible_connection=local
[controllers]
controller0 ansible_host=172.17.0.1 ansible_connection=local
-[kafka]
-172.17.0.1 ansible_host=172.17.0.1 ansible_connection=local
+[kafkas]
+kafka0 ansible_host=172.17.0.1 ansible_connection=local
+
+[zookeepers:children]
+kafkas
[invokers]
invoker0 ansible_host=172.17.0.1 ansible_connection=local
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index 1be60b3..bf30063 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -19,7 +19,7 @@ $ANSIBLE_CMD prereq.yml
$ANSIBLE_CMD couchdb.yml
$ANSIBLE_CMD initdb.yml
$ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml -e cli_installation_mode=remote
+$ANSIBLE_CMD openwhisk.yml
docker images
docker ps
----------------------------------------------------------------
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