diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-16 11:54:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 11:54:33 -0400 |
| commit | f43e5a4db35e04bcaa7cc91bf9dd732f963380ea (patch) | |
| tree | 3f24e493db6a46b6ecaa0e09104191529f68b960 /roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json | |
| parent | 4ac0ed94f45c872e283e754f383e548ba03788c7 (diff) | |
| parent | 3dbd7ed2cf97092ef346f26bac802c3a4624c247 (diff) | |
| download | openshift-f43e5a4db35e04bcaa7cc91bf9dd732f963380ea.tar.gz openshift-f43e5a4db35e04bcaa7cc91bf9dd732f963380ea.tar.bz2 openshift-f43e5a4db35e04bcaa7cc91bf9dd732f963380ea.tar.xz openshift-f43e5a4db35e04bcaa7cc91bf9dd732f963380ea.zip | |
Merge pull request #2304 from sdodson/image-stream-sync
Image stream sync
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json')
| -rw-r--r-- | roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json index 5f133b946..8a4ec41b2 100644 --- a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json @@ -3,7 +3,6 @@ "apiVersion": "v1", "metadata": { "name": "mysql-ephemeral", - "creationTimestamp": null, "annotations": { "description": "MySQL database service, without persistent storage. WARNING: Any data stored will be lost upon pod destruction. Only use this template for testing", "iconClass": "icon-mysql-database", @@ -60,7 +59,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "mysql:latest", + "name": "mysql:5.6", "namespace": "${NAMESPACE}" }, "lastTriggeredImage": "" @@ -122,10 +121,10 @@ } ], "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - }, + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, "volumeMounts": [ { "name": "${DATABASE_SERVICE_NAME}-data", @@ -179,7 +178,7 @@ }, { "name": "MYSQL_USER", - "displayName": "MySQL User", + "displayName": "MySQL Connection Username", "description": "Username for MySQL user that will be used for accessing the database.", "generate": "expression", "from": "user[A-Z0-9]{3}", @@ -187,8 +186,8 @@ }, { "name": "MYSQL_PASSWORD", - "displayName": "MySQL Password", - "description": "Password for the MySQL user.", + "displayName": "MySQL Connection Password", + "description": "Password for the MySQL connection user.", "generate": "expression", "from": "[a-zA-Z0-9]{16}", "required": true |