From: Thomas Goirand Date: Wed, 24 Sep 2014 10:48:43 +0000 (+0800) Subject: Fixed the DB connection directive name and section. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4c3c367a1f6aa35efc143b525684bcf7ddc14d68;p=openstack-build%2Fcinder-build.git Fixed the DB connection directive name and section. Rewritten-From: 92028e8a6ad9182909767fad4f3f1d317917ad57 --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 8e570578c..d564049ea 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,3 +1,9 @@ +cinder (2014.2~b3-2) experimental; urgency=medium + + * Fixed the DB connection directive name and section. + + -- Thomas Goirand Wed, 24 Sep 2014 18:50:02 +0800 + cinder (2014.2~b3-1) experimental; urgency=medium [ Thomas Goirand ] diff --git a/xenial/debian/cinder-common.config.in b/xenial/debian/cinder-common.config.in index ec9fc6bcc..3ebfbd6cc 100644 --- a/xenial/debian/cinder-common.config.in +++ b/xenial/debian/cinder-common.config.in @@ -8,7 +8,7 @@ CINDER_CONF=/etc/cinder/cinder.conf #PKGOS-INCLUDE# pkgos_var_user_group cinder -pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} DEFAULT sql_connection cinder $@ +pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} database connection cinder $@ pkgos_rabbit_read_conf ${CINDER_CONF} DEFAULT cinder pkgos_read_admin_creds ${CINDER_CONF} keystone_authtoken cinder diff --git a/xenial/debian/cinder-common.postinst.in b/xenial/debian/cinder-common.postinst.in index d949ac9d1..443a20aea 100644 --- a/xenial/debian/cinder-common.postinst.in +++ b/xenial/debian/cinder-common.postinst.in @@ -21,7 +21,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then pkgos_write_new_conf cinder cinder.conf pkgos_write_new_conf cinder api-paste.ini pkgos_write_new_conf cinder logging.conf - pkgos_dbc_postinst ${CINDER_CONF} DEFAULT sql_connection cinder $@ + pkgos_dbc_postinst ${CINDER_CONF} database connection cinder $@ pkgos_rabbit_write_conf ${CINDER_CONF} DEFAULT cinder pkgos_write_admin_creds ${CINDER_CONF} keystone_authtoken cinder db_get cinder/volume_group