X-dark/django-ex
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #37 from gabemontero/3563

Browse source 
parameterize IS namespace
This commit is contained in:
Ben Parees 2016-03-14 21:27:13 +00:00
commit 7bfcaa7e11
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openshift/templates/django-postgresql.json
View file

@ -82,7 +82,7 @@
"sourceStrategy": { "sourceStrategy": {
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "openshift", "namespace": "${NAMESPACE}",
"name": "python:3.4" "name": "python:3.4"
} }
} }
@ -266,7 +266,7 @@
], ],
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "openshift", "namespace": "${NAMESPACE}",
"name": "postgresql:9.4" "name": "postgresql:9.4"
} }
} }
@ -344,6 +344,12 @@
"required": true, "required": true,
"value": "django-psql-example" "value": "django-psql-example"
}, },
{
"name": "NAMESPACE",
"displayName": "Namespace",
"description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift"
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",

8
openshift/templates/django.json
View file

@ -82,7 +82,7 @@
"sourceStrategy": { "sourceStrategy": {
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "openshift", "namespace": "${NAMESPACE}",
"name": "python:3.4" "name": "python:3.4"
} }
} }
@ -230,6 +230,12 @@
"required": true, "required": true,
"value": "django-example" "value": "django-example"
}, },
{
"name": "NAMESPACE",
"displayName": "Namespace",
"description": "The OpenShift Namespace where the ImageStream resides.",
"value": "openshift"
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",