diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-08-24 08:13:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 08:13:15 -0400 |
commit | fd31f32f484e922e06cb58d582a6490223fc039b (patch) | |
tree | 1705cd1aad3aa3e3686090b403f81c7e84ef28e1 /roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json | |
parent | b872f49ea3c08be7ba73ba765006e871fc8bd88f (diff) | |
parent | 3566d5cf07459dec226be2b4ec2fabe1d5df790f (diff) | |
download | openshift-fd31f32f484e922e06cb58d582a6490223fc039b.tar.gz openshift-fd31f32f484e922e06cb58d582a6490223fc039b.tar.bz2 openshift-fd31f32f484e922e06cb58d582a6490223fc039b.tar.xz openshift-fd31f32f484e922e06cb58d582a6490223fc039b.zip |
Merge pull request #5161 from sdodson/image-stream-sync
Sync latest image stream and templates
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json')
-rw-r--r-- | roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json b/roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json index 3b7fdccce..4378fa4a0 100644 --- a/roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json +++ b/roles/openshift_examples/files/examples/v3.7/db-templates/mariadb-persistent-template.json @@ -27,13 +27,15 @@ "annotations": { "template.openshift.io/expose-username": "{.data['database-user']}", "template.openshift.io/expose-password": "{.data['database-password']}", - "template.openshift.io/expose-root_password": "{.data['database-root-password']}" + "template.openshift.io/expose-root_password": "{.data['database-root-password']}", + "template.openshift.io/expose-database_name": "{.data['database-name']}" } }, "stringData" : { "database-user" : "${MYSQL_USER}", "database-password" : "${MYSQL_PASSWORD}", - "database-root-password" : "${MYSQL_ROOT_PASSWORD}" + "database-root-password" : "${MYSQL_ROOT_PASSWORD}", + "database-name" : "${MYSQL_DATABASE}" } }, { @@ -78,7 +80,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${DATABASE_SERVICE_NAME}" + "name": "${DATABASE_SERVICE_NAME}", + "annotations": { + "template.alpha.openshift.io/wait-for-ready": "true" + } }, "spec": { "strategy": { @@ -168,7 +173,12 @@ }, { "name": "MYSQL_DATABASE", - "value": "${MYSQL_DATABASE}" + "valueFrom": { + "secretKeyRef" : { + "name" : "${DATABASE_SERVICE_NAME}", + "key" : "database-name" + } + } } ], "resources": { |