diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-25 20:21:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-25 20:21:15 -0800 |
| commit | 26f327b96cbe3072589105decee4a7d78932668b (patch) | |
| tree | 1884a1ba59148d0445f1413cab8fcf8371c21b53 /roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json | |
| parent | a97704f4db140037a67aeb2ca45254e4ecffed6e (diff) | |
| parent | 796d2ddbd7976b46b4b8d123016cc38721c6529e (diff) | |
| download | openshift-26f327b96cbe3072589105decee4a7d78932668b.tar.gz openshift-26f327b96cbe3072589105decee4a7d78932668b.tar.bz2 openshift-26f327b96cbe3072589105decee4a7d78932668b.tar.xz openshift-26f327b96cbe3072589105decee4a7d78932668b.zip | |
Merge pull request #6875 from bparees/sync
Automatic merge from submit-queue.
sync imagestreams+templates from origin master for v3.9
fixes https://github.com/openshift/openshift-ansible/issues/6872
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json')
| -rw-r--r-- | roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json b/roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json index c0946416d..bed940a37 100644 --- a/roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v3.9/db-templates/mysql-ephemeral-template.json @@ -5,7 +5,7 @@ "name": "mysql-ephemeral", "annotations": { "openshift.io/display-name": "MySQL (Ephemeral)", - "description": "MySQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing", + "description": "MySQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing", "iconClass": "icon-mysql-database", "tags": "database,mysql", "openshift.io/long-description": "This template provides a standalone MySQL server with a database created. The database is not stored on persistent storage, so any restart of the service will result in all data being lost. The database name, username, and password are chosen via parameters when provisioning this service.", @@ -14,7 +14,7 @@ "openshift.io/support-url": "https://access.redhat.com" } }, - "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.", + "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.", "labels": { "template": "mysql-ephemeral-template" }, |