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

Merge pull request #36 from gabemontero/issue3571

Browse source 
parameterize name
This commit is contained in:
Ben Parees 2016-03-11 21:32:50 +00:00
commit 96e934a9fc
2 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "django-psql-example",
"name": "${NAME}",
"annotations": {
"description": "Exposes and load balances the application pods"
}
@ -31,7 +31,7 @@
}
],
"selector": {
"name": "django-psql-example"
"name": "${NAME}"
}
}
},
@ -39,13 +39,13 @@
"kind": "Route",
"apiVersion": "v1",
"metadata": {
"name": "django-psql-example"
"name": "${NAME}"
},
"spec": {
"host": "${APPLICATION_DOMAIN}",
"to": {
"kind": "Service",
"name": "django-psql-example"
"name": "${NAME}"
}
}
},
@ -53,7 +53,7 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "django-psql-example",
"name": "${NAME}",
"annotations": {
"description": "Keeps track of changes in the application image"
}
@ -63,7 +63,7 @@
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "django-psql-example",
"name": "${NAME}",
"annotations": {
"description": "Defines how to build the application"
}
@ -90,7 +90,7 @@
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "django-psql-example:latest"
"name": "${NAME}:latest"
}
},
"triggers": [
@ -116,7 +116,7 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "django-psql-example",
"name": "${NAME}",
"annotations": {
"description": "Defines how to deploy the application server"
}
@ -135,7 +135,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "django-psql-example:latest"
"name": "${NAME}:latest"
}
}
},
@ -145,13 +145,13 @@
],
"replicas": 1,
"selector": {
"name": "django-psql-example"
"name": "${NAME}"
},
"template": {
"metadata": {
"name": "django-psql-example",
"name": "${NAME}",
"labels": {
"name": "django-psql-example"
"name": "${NAME}"
}
},
"spec": {
@ -337,6 +337,13 @@
}
],
"parameters": [
{
"name": "NAME",
"displayName": "Name",
"description": "The name assigned to all of the frontend objects defined in this template.",
"required": true,
"value": "django-psql-example"
},
{
"name": "MEMORY_LIMIT",
"displayName": "Memory Limit",

31
openshift/templates/django.json
View file

@ -17,7 +17,7 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "django-example",
"name": "${NAME}",
"annotations": {
"description": "Exposes and load balances the application pods"
}
@ -31,7 +31,7 @@
}
],
"selector": {
"name": "django-example"
"name": "${NAME}"
}
}
},
@ -39,13 +39,13 @@
"kind": "Route",
"apiVersion": "v1",
"metadata": {
"name": "django-example"
"name": "${NAME}"
},
"spec": {
"host": "${APPLICATION_DOMAIN}",
"to": {
"kind": "Service",
"name": "django-example"
"name": "${NAME}"
}
}
},
@ -53,7 +53,7 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "django-example",
"name": "${NAME}",
"annotations": {
"description": "Keeps track of changes in the application image"
}
@ -63,7 +63,7 @@
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "django-example",
"name": "${NAME}",
"annotations": {
"description": "Defines how to build the application"
}
@ -90,7 +90,7 @@
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "django-example:latest"
"name": "${NAME}:latest"
}
},
"triggers": [
@ -116,7 +116,7 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "django-example",
"name": "${NAME}",
"annotations": {
"description": "Defines how to deploy the application server"
}
@ -135,7 +135,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "django-example:latest"
"name": "${NAME}:latest"
}
}
},
@ -145,13 +145,13 @@
],
"replicas": 1,
"selector": {
"name": "django-example"
"name": "${NAME}"
},
"template": {
"metadata": {
"name": "django-example",
"name": "${NAME}",
"labels": {
"name": "django-example"
"name": "${NAME}"
}
},
"spec": {
@ -223,6 +223,13 @@
}
],
"parameters": [
{
"name": "NAME",
"displayName": "Name",
"description": "The name assigned to all of the frontend objects defined in this template.",
"required": true,
"value": "django-example"
},
{
"name": "MEMORY_LIMIT",
"displayName": "Memory Limit",