summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-27 13:41:16 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-27 13:41:16 -0300
commitd54665d0c0c1f7a3cec572c04f3ce769277c05e4 (patch)
tree043628b7a804ad66019129129cc0186289d80a28 /roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
parent055921cd545c12733949f37c1af2c0a1296216ec (diff)
parent5c7e1366ad8ae67ef23117d296a65a6ee81ccd29 (diff)
downloadopenshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.gz
openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.bz2
openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.xz
openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.zip
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json')
-rw-r--r--roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json18
1 files changed, 11 insertions, 7 deletions
diff --git a/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json b/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
index 697a4ad68..b384a5992 100644
--- a/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/db-templates/mysql-ephemeral-template.json
@@ -1,6 +1,6 @@
{
"kind": "Template",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "mysql-ephemeral",
"creationTimestamp": null,
@@ -13,7 +13,7 @@
"objects": [
{
"kind": "Service",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -41,7 +41,7 @@
},
{
"kind": "DeploymentConfig",
- "apiVersion": "v1beta3",
+ "apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
"creationTimestamp": null
@@ -143,24 +143,28 @@
{
"name": "DATABASE_SERVICE_NAME",
"description": "Database service name",
- "value": "mysql"
+ "value": "mysql",
+ "required": true
},
{
"name": "MYSQL_USER",
"description": "Username for MySQL user that will be used for accessing the database",
"generate": "expression",
- "from": "user[A-Z0-9]{3}"
+ "from": "user[A-Z0-9]{3}",
+ "required": true
},
{
"name": "MYSQL_PASSWORD",
"description": "Password for the MySQL user",
"generate": "expression",
- "from": "[a-zA-Z0-9]{16}"
+ "from": "[a-zA-Z0-9]{16}",
+ "required": true
},
{
"name": "MYSQL_DATABASE",
"description": "Database name",
- "value": "sampledb"
+ "value": "sampledb",
+ "required": true
}
],
"labels": {