This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git
The following commit(s) were added to refs/heads/master by this push: new ce8f348 Adapt the DB config to match with pureconfig switch (#105) ce8f348 is described below commit ce8f3480453c8eb33ce40985e7f380098e15c5ff Author: Chetan Mehrotra <chet...@apache.org> AuthorDate: Tue Mar 13 17:03:50 2018 +0530 Adapt the DB config to match with pureconfig switch (#105) --- docker-compose/docker-compose.yml | 26 ++++++++++++++------------ docker-compose/docker-whisk-controller.env | 7 +++---- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 0a1a893..f5b6015 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -56,16 +56,18 @@ services: KAFKA_HOSTS: kafka.docker:9092 ZOOKEEPER_HOSTS: zookeeper.docker:2181 - DB_PROVIDER: CouchDB - DB_PROTOCOL: http - DB_PORT: 5984 - DB_HOST: db.docker - DB_USERNAME: whisk_admin - DB_PASSWORD: some_passw0rd + CONFIG_whisk_couchdb_provider: CouchDB + CONFIG_whisk_couchdb_protocol: http + CONFIG_whisk_couchdb_port: 5984 + CONFIG_whisk_couchdb_host: db.docker + CONFIG_whisk_couchdb_username: whisk_admin + CONFIG_whisk_couchdb_password: some_passw0rd CONFIG_akka_remote_netty_tcp_hostname: controller CONFIG_akka_remote_netty_tcp_port: 2551 CONFIG_akka_remote_netty_tcp_bindPort: 2551 + CONFIG_akka_actor_provider: cluster + LOADBALANCER_HOST: ${DOCKER_COMPOSE_HOST} LOADBALANCER_HOST_PORT: 443 volumes: @@ -99,12 +101,12 @@ services: KAFKA_HOSTS: kafka.docker:9092 ZOOKEEPER_HOSTS: zookeeper.docker:2181 - DB_PROVIDER: CouchDB - DB_PROTOCOL: http - DB_PORT: 5984 - DB_HOST: db.docker - DB_USERNAME: whisk_admin - DB_PASSWORD: some_passw0rd + CONFIG_whisk_couchdb_provider: CouchDB + CONFIG_whisk_couchdb_protocol: http + CONFIG_whisk_couchdb_port: 5984 + CONFIG_whisk_couchdb_host: db.docker + CONFIG_whisk_couchdb_username: whisk_admin + CONFIG_whisk_couchdb_password: some_passw0rd EDGE_HOST: ${DOCKER_COMPOSE_HOST} EDGE_HOST_APIPORT: 443 diff --git a/docker-compose/docker-whisk-controller.env b/docker-compose/docker-whisk-controller.env index d4eaf42..29c79d1 100644 --- a/docker-compose/docker-whisk-controller.env +++ b/docker-compose/docker-whisk-controller.env @@ -11,10 +11,10 @@ SERVICE_CHECK_INTERVAL=15s DB_PREFIX=local_ -DB_WHISK_AUTHS=local_subjects -DB_WHISK_ACTIONS=local_whisks +CONFIG_whisk_couchdb_databases_WhiskAuth=local_subjects +CONFIG_whisk_couchdb_databases_WhiskEntity=local_whisks CONFIG_whisk_db_actionsDdoc=whisks.v2.1.0 -DB_WHISK_ACTIVATIONS=local_activations +CONFIG_whisk_couchdb_databases_WhiskActivation=local_activations CONFIG_whisk_db_activationsDdoc=whisks.v2.1.0 CONFIG_whisk_db_activationsFilterDdoc=whisks-filters.v2.1.0 @@ -37,7 +37,6 @@ LIMITS_ACTIONS_SEQUENCE_MAXLENGTH=20 CONFIG_whisk_loadbalancer_blackboxFraction=0.1 CONFIG_kamon_statsd_port=8125 CONFIG_whisk_loadbalancer_invokerBusyThreshold=16 -CONFIG_akka_actor_provider=local CONTROLLER_BLACKBOXFRACTION=0.10 CONTROLLER_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098 -- To stop receiving notification emails like this one, please contact csantan...@apache.org.