2 files changed, 5 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
index 71f5fb4..93577bb 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
@@ -3,7 +3,7 @@
 ####################
 
 [DEFAULT]
-sql_connection = postgresql://admin:admin@localhost/cinder
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/cinder
 api_paste_confg = /etc/cinder/api-paste.ini
 state_path = /etc/cinder/data/
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb b/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb
index e3d2b7e..95fa45b 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_2013.1.1.bb
@@ -29,6 +29,9 @@ do_install_append() {
     sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \
         -i ${WORKDIR}/api-paste.ini
 
+    sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/cinder.conf
+    sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/cinder.conf
+
     install -d ${CINDER_CONF_DIR}
     install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/
     install -m 600 ${WORKDIR}/api-paste.ini ${CINDER_CONF_DIR}/
@@ -53,7 +56,7 @@ pkg_postinst_${SRCNAME} () {
        sudo -u postgres initdb -D /etc/postgresql/
        /etc/init.d/postgresql start
        sleep 0.2
-       sudo -u postgres psql -c "CREATE ROLE admin WITH SUPERUSER LOGIN PASSWORD 'admin'"
+       sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'"
     fi
 
     sudo -u postgres createdb cinder