Fixed the DB connection directive name and section.

Rewritten-From: 92028e8a6ad9182909767fad4f3f1d317917ad57

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 8e570578c760edfa6cd104727142dad4b20b2784..d564049eaadb39f302d861e1e9648d015280a744 100644 (file)
--- 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 <zigo@debian.org>  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 ec9fc6bccc9785153b0b490dafb118c796a2a38e..3ebfbd6cc77d5b4bd6290515059098fca3174297 100644 (file)
--- 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 d949ac9d1d9f7eaba7f89193df290f0273f114e0..443a20aea98d9f50343b322a67f74bc569aaeaab 100644 (file)
--- 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