vbatts/nodejs-ex
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #24 from bparees/param

Browse source 
parameterize db image
This commit is contained in:
Michal Fojtik 2015-08-03 10:37:06 +02:00
commit 457a80a7be
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
openshift/templates/nodejs-mongodb.json
View file

@ -165,19 +165,19 @@
},
{
"name": "MONGODB_USER",
"value": "${MONGODB_USER}"
"value": "${DATABASE_USER}"
},
{
"name": "MONGODB_PASSWORD",
"value": "${MONGODB_PASSWORD}"
"value": "${DATABASE_PASSWORD}"
},
{
"name": "MONGODB_DATABASE",
"value": "${MONGODB_DATABASE}"
"value": "${DATABASE_NAME}"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${MONGODB_ADMIN_PASSWORD}"
"value": "${DATABASE_ADMIN_PASSWORD}"
}
]
}
@ -241,7 +241,7 @@
"containers": [
{
"name": "mongodb",
"image": "openshift/mongodb-24-centos7",
"image": "${MONGODB_IMAGE}",
"ports": [
{
"containerPort": 27017
@ -250,19 +250,19 @@
"env": [
{
"name": "MONGODB_USER",
"value": "${MONGODB_USER}"
"value": "${DATABASE_USER}"
},
{
"name": "MONGODB_PASSWORD",
"value": "${MONGODB_PASSWORD}"
"value": "${DATABASE_PASSWORD}"
},
{
"name": "MONGODB_DATABASE",
"value": "${MONGODB_DATABASE}"
"value": "${DATABASE_NAME}"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${MONGODB_ADMIN_PASSWORD}"
"value": "${DATABASE_ADMIN_PASSWORD}"
}
]
}
@ -303,27 +303,32 @@
"value": "mongodb"
},
{
"name": "MONGODB_USER",
"name": "DATABASE_USER",
"description": "Username for MongoDB user that will be used for accessing the database",
"generate": "expression",
"from": "user[A-Z0-9]{3}"
},
{
"name": "MONGODB_PASSWORD",
"name": "DATABASE_PASSWORD",
"description": "Password for the MongoDB user",
"generate": "expression",
"from": "[a-zA-Z0-9]{16}"
},
{
"name": "MONGODB_DATABASE",
"name": "DATABASE_NAME",
"description": "Database name",
"value": "sampledb"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"name": "DATABASE_ADMIN_PASSWORD",
"description": "Password for the database admin user",
"generate": "expression",
"from": "[a-zA-Z0-9]{16}"
},
{
"name": "MONGODB_IMAGE",
"description": "Image to use for mongodb",
"value": "openshift/mongodb-24-centos7"
}
]
}