From b7513ae56a129f223c1db088722e87a56500c95e Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Tue, 16 Jul 2013 17:37:16 +0300 Subject: python-glance: Configure postgresql credentials The user and password for postgresql are defined in the identity class and are loaded by the recipes from this class. Signed-off-by: Mihai Prica --- meta-openstack/recipes-devtools/python/python-glance_2013.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-glance_2013.1.bb') diff --git a/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb b/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb index d8cd97b..56997d8 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_2013.1.bb @@ -29,7 +29,7 @@ do_install_append() { sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/glance-$file.conf sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \ -i ${WORKDIR}/glance-$file.conf - sed -e "s#^sql_conn.*#sql_connection = postgresql://admin:admin@localhost/glance#g" \ + sed -e "s#^sql_conn.*#sql_connection = postgresql://${DB_USER}:${DB_PASSWORD}@localhost/glance#g" \ -i ${WORKDIR}/glance-$file.conf done sed -e "s:^filesystem_store_datadir =.*:filesystem_store_datadir = ${sysconfdir}/${SRCNAME}/images/:g" \ @@ -68,7 +68,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 mkdir /var/log/glance -- cgit v1.2.3-54-g00ecf