Merge pull request #26 from csantanapr/bum_openwhisk_3.13
update to pickup openwhisk@3.13.1
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index a1af820..7bcd941 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -4,6 +4,8 @@
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_
@@ -20,11 +22,11 @@
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
+
+env_hosts_dir: "{{ playbook_dir }}/environments/local"
+
runtimes_manifest:
defaultImagePrefix: "openwhisk"
defaultImageTag: "latest"
@@ -42,3 +44,5 @@
deprecated: false
blackboxes:
- name: "dockerskeleton"
+
+controller_protocol: "http"
diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts
index ce8c7c5..4715e55 100644
--- a/ansible/environments/local/hosts
+++ b/ansible/environments/local/hosts
@@ -17,7 +17,6 @@
[invokers]
invoker0 ansible_host=172.17.0.1 ansible_connection=local
-invoker1 ansible_host=172.17.0.1 ansible_connection=local
; db group is only used if db_provider is CouchDB
[db]
diff --git a/core/nodejs6Action/CHANGELOG.md b/core/nodejs6Action/CHANGELOG.md
index a3c7006..079a4a2 100644
--- a/core/nodejs6Action/CHANGELOG.md
+++ b/core/nodejs6Action/CHANGELOG.md
@@ -1,5 +1,10 @@
# NodeJS 6 OpenWhisk Runtime Container
+## 1.6.0
+Change: Update npm openwhisk package
+
+- [openwhisk v3.13.1](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs.
+
## 1.5.0
Change: Update npm openwhisk package
diff --git a/core/nodejs6Action/Dockerfile b/core/nodejs6Action/Dockerfile
index 102af6d..f8eef8c 100644
--- a/core/nodejs6Action/Dockerfile
+++ b/core/nodejs6Action/Dockerfile
@@ -46,7 +46,7 @@
node-uuid@1.4.7 \
nodemailer@2.6.4 \
oauth2-server@2.4.1 \
-openwhisk@3.12.0 \
+openwhisk@3.13.1 \
pkgcloud@1.4.0 \
process@0.11.9 \
pug@">=2.0.0-beta6 <2.0.1" \
diff --git a/core/nodejs8Action/CHANGELOG.md b/core/nodejs8Action/CHANGELOG.md
index 3c93b9d..2ad64e9 100644
--- a/core/nodejs8Action/CHANGELOG.md
+++ b/core/nodejs8Action/CHANGELOG.md
@@ -1,5 +1,10 @@
# NodeJS 8 OpenWhisk Runtime Container
+## 1.3.0
+Change: Update npm openwhisk package
+
+- [openwhisk v3.13.1](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs.
+
## 1.2.0
Change: Update npm openwhisk package
diff --git a/core/nodejs8Action/package.json b/core/nodejs8Action/package.json
index 43a8e08..7eab06b 100644
--- a/core/nodejs8Action/package.json
+++ b/core/nodejs8Action/package.json
@@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
- "openwhisk": "3.12.0",
+ "openwhisk": "3.13.1",
"body-parser": "1.18.2",
"express": "4.16.2"
}
