You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/01/04 19:31:27 UTC
[GitHub] rabbah closed pull request #3142: externalize runtimesManifestDefault to runtimes.json
rabbah closed pull request #3142: externalize runtimesManifestDefault to runtimes.json
URL: https://github.com/apache/incubator-openwhisk/pull/3142
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/files/runtimes.json b/ansible/files/runtimes.json
new file mode 100644
index 0000000000..8030fa2405
--- /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 5cde947173..1f689a1e59 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) }}"
----------------------------------------------------------------
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