summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-25 08:21:08 -0500
committerScott Dodson <sdodson@redhat.com>2017-01-25 08:21:57 -0500
commit059ca93e37eaad6f83755e56f65d8175893972f0 (patch)
tree507054f0ec1fb4ae86080d74cf0436c2a276a65d /roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json
parent8b4c3d65469c444402317eaaecae9e955b4b4f20 (diff)
downloadopenshift-059ca93e37eaad6f83755e56f65d8175893972f0.tar.gz
openshift-059ca93e37eaad6f83755e56f65d8175893972f0.tar.bz2
openshift-059ca93e37eaad6f83755e56f65d8175893972f0.tar.xz
openshift-059ca93e37eaad6f83755e56f65d8175893972f0.zip
Sync latest image streams
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json24
1 files changed, 15 insertions, 9 deletions
diff --git a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json b/roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json
index dccb8bf7f..18100974b 100644
--- a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json
+++ b/roles/openshift_examples/files/examples/v1.5/quickstart-templates/dancer-mysql.json
@@ -22,8 +22,9 @@
"name": "${NAME}"
},
"stringData" : {
- "databaseUser" : "${DATABASE_USER}",
- "databasePassword" : "${DATABASE_PASSWORD}"
+ "database-user" : "${DATABASE_USER}",
+ "database-password" : "${DATABASE_PASSWORD}",
+ "keybase" : "${SECRET_KEY_BASE}"
}
},
{
@@ -97,7 +98,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${NAMESPACE}",
- "name": "perl:5.20"
+ "name": "perl:5.24"
},
"env": [
{
@@ -207,7 +208,7 @@
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
- "key" : "databaseUser"
+ "key" : "database-user"
}
}
},
@@ -216,7 +217,7 @@
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
- "key" : "databasePassword"
+ "key" : "database-password"
}
}
},
@@ -226,7 +227,12 @@
},
{
"name": "SECRET_KEY_BASE",
- "value": "${SECRET_KEY_BASE}"
+ "valueFrom": {
+ "secretKeyRef" : {
+ "name" : "${NAME}",
+ "key" : "keybase"
+ }
+ }
},
{
"name": "PERL_APACHE2_RELOAD",
@@ -290,7 +296,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${NAMESPACE}",
- "name": "mysql:5.6"
+ "name": "mysql:5.7"
}
}
},
@@ -351,7 +357,7 @@
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
- "key" : "databaseUser"
+ "key" : "database-user"
}
}
},
@@ -360,7 +366,7 @@
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
- "key" : "databasePassword"
+ "key" : "database-password"
}
}
},