You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2018/01/04 19:31:24 UTC
[incubator-openwhisk] branch master updated: externalize
runtimesManifestDefault to runtimes.json (#3142)
This is an automated email from the ASF dual-hosted git repository.
rabbah 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 5ad6ce0 externalize runtimesManifestDefault to runtimes.json (#3142)
5ad6ce0 is described below
commit 5ad6ce0a9d1611d39d7cade49ad6bfe767a7510b
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Thu Jan 4 14:31:22 2018 -0500
externalize runtimesManifestDefault to runtimes.json (#3142)
Move definition of default runtimes manifest out of
group_vars/all to an external .json file to make it
easier to share this configuration information with
non-ansible deployments such as kube/mesos/etc.
---
ansible/files/runtimes.json | 111 ++++++++++++++++++++++++++++++++++++++++++++
ansible/group_vars/all | 72 +---------------------------
2 files changed, 113 insertions(+), 70 deletions(-)
diff --git a/ansible/files/runtimes.json b/ansible/files/runtimes.json
new file mode 100644
index 0000000..8030fa2
--- /dev/null
+++ b/ansible/files/runtimes.json
@@ -0,0 +1,111 @@
+{
+ "bypassPullForLocalImages": false,
+ "defaultImagePrefix": "openwhisk",
+ "defaultImageTag": "latest",
+ "runtimes": {
+ "nodejs": [
+ {
+ "kind": "nodejs",
+ "image": {
+ "name": "nodejsaction"
+ },
+ "deprecated": true
+ },
+ {
+ "kind": "nodejs:6",
+ "default": true,
+ "image": {
+ "name": "nodejs6action"
+ },
+ "deprecated": false
+ },
+ {
+ "kind": "nodejs:8",
+ "default": false,
+ "image": {
+ "name": "action-nodejs-v8"
+ },
+ "deprecated": false
+ }
+ ],
+ "python": [
+ {
+ "kind": "python",
+ "image": {
+ "name": "python2action"
+ },
+ "deprecated": false
+ },
+ {
+ "kind": "python:2",
+ "default": true,
+ "image": {
+ "name": "python2action"
+ },
+ "deprecated": false
+ },
+ {
+ "kind": "python:3",
+ "image": {
+ "name": "python3action"
+ },
+ "deprecated": false
+ }
+ ],
+ "swift": [
+ {
+ "kind": "swift",
+ "image": {
+ "name": "swiftaction"
+ },
+ "deprecated": true
+ },
+ {
+ "kind": "swift:3",
+ "image": {
+ "name": "swift3action"
+ },
+ "deprecated": true
+ },
+ {
+ "kind": "swift:3.1.1",
+ "default": true,
+ "image": {
+ "name": "action-swift-v3.1.1"
+ },
+ "deprecated": false
+ }
+ ],
+ "java": [
+ {
+ "kind": "java",
+ "default": true,
+ "image": {
+ "name": "java8action"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "jarfile",
+ "attachmentType": "application/java-archive"
+ },
+ "sentinelledLogs": false,
+ "requireMain": true
+ }
+ ],
+ "php": [
+ {
+ "kind": "php:7.1",
+ "default": true,
+ "deprecated": false,
+ "image": {
+ "name": "action-php-v7.1"
+ }
+ }
+ ]
+ },
+ "blackboxes": [
+ {
+ "name": "dockerskeleton"
+ }
+ ]
+}
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index dcf2d8a..4f381ad 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -30,77 +30,9 @@ whisk:
# runtimes: set of language runtime families grouped by language (e.g., nodejs, python)
# blackboxes: list of pre-populated docker action images as "name" with optional "prefix" and "tag"
# bypassPullForLocalImages: optional, if true, allow images with a prefix that matches {{ docker.image.prefix }}
-# to skip docker pull in invoker even if the image is not part of the blackboxe set
+# to skip docker pull in invoker even if the image is not part of the blackbox set
#
-runtimesManifest: "{{ runtimes_manifest | default(runtimesManifestDefault) }}"
-
-runtimesManifestDefault:
- bypassPullForLocalImages: "{{ bypass_pull_for_local_images | default(false) }}"
- defaultImagePrefix: "openwhisk"
- defaultImageTag: "latest"
- runtimes:
- nodejs:
- - kind: "nodejs"
- image:
- name: "nodejsaction"
- deprecated: true
- - kind: "nodejs:6"
- default: true
- image:
- name: "nodejs6action"
- deprecated: false
- - kind: "nodejs:8"
- default: false
- image:
- name: "action-nodejs-v8"
- deprecated: false
- python:
- - kind: "python"
- image:
- name: "python2action"
- deprecated: false
- - kind: "python:2"
- default: true
- image:
- name: "python2action"
- deprecated: false
- - kind: "python:3"
- image:
- name: "python3action"
- deprecated: false
- swift:
- - kind: "swift"
- image:
- name: "swiftaction"
- deprecated: true
- - kind: "swift:3"
- image:
- name: "swift3action"
- deprecated: true
- - kind: "swift:3.1.1"
- default: true
- image:
- name: "action-swift-v3.1.1"
- deprecated: false
- java:
- - kind: "java"
- default: true
- image:
- name: "java8action"
- deprecated: false
- attached:
- attachmentName: "jarfile"
- attachmentType: "application/java-archive"
- sentinelledLogs: false
- requireMain: true
- php:
- - kind: "php:7.1"
- default: true
- deprecated: false
- image:
- name: "action-php-v7.1"
- blackboxes:
- - name: "dockerskeleton"
+runtimesManifest: "{{ runtimes_manifest | default(lookup('file', '{{ openwhisk_home }}/ansible/files/runtimes.json') | from_json) }}"
limits:
invocationsPerMinute: "{{ limit_invocations_per_minute | default(60) }}"
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].