From: Thomas Goirand <thomas@goirand.fr>
Date: Sat, 16 Mar 2013 06:00:56 +0000 (+0800)
Subject: Rewrote pkgos_func parameter orders to match the new system.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e2e730a2900e69246e895be6785f64ae2c2966c1;p=openstack-build%2Fcinder-build.git

Rewrote pkgos_func parameter orders to match the new system.

Rewritten-From: ff80f6fde97887f421864293449cd9e8797e2fc6
---

diff --git a/xenial/debian/cinder-common.config.in b/xenial/debian/cinder-common.config.in
index d51e0c5e6..4dc16f22a 100644
--- a/xenial/debian/cinder-common.config.in
+++ b/xenial/debian/cinder-common.config.in
@@ -19,13 +19,14 @@ manage_cinder_enable () {
 	echo "# defaults file for cinder daemons
 
 # start cinder daemons from init.d script?
-#  only allowed values are \"true\" and \"false\"
+# only allowed values are \"true\" and \"false\",
+# any change to this file will be reset on upgrades.
 CINDER_ENABLE=${CINDER_ENABLE}" >${CINDER_COM_DEF}	
 }
 
 pkgos_var_user_group cinder
 pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} DEFAULT sql_connection cinder $@
-pkgos_read_admin_creds ${CINDER_API} cinder filter:authtoken
+pkgos_read_admin_creds ${CINDER_API} filter:authtoken cinder
 manage_cinder_enable
 
 pkgos_inifile get ${CINDER_CONF} DEFAULT volume_group
diff --git a/xenial/debian/cinder-common.postinst.in b/xenial/debian/cinder-common.postinst.in
index 22c628672..c09f6d1cd 100644
--- a/xenial/debian/cinder-common.postinst.in
+++ b/xenial/debian/cinder-common.postinst.in
@@ -15,8 +15,8 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	pkgos_write_new_conf cinder cinder.conf
 	pkgos_write_new_conf cinder api-paste.ini
 	chown root:root /etc/cinder/rootwrap.d/volume.filters
-	pkgos_dbc_postinst ${CINDER_CONF} cinder DEFAULT sql_connection $@
-	pkgos_write_admin_creds ${CINDER_API} cinder filter:authtoken
+	pkgos_dbc_postinst ${CINDER_CONF} DEFAULT sql_connection cinder $@
+	pkgos_write_admin_creds ${CINDER_API} filter:authtoken cinder
 	db_get cinder/volume_group
 	if [ -n "${RET}" ] ; then
 		pkgos_inifile set ${CINDER_CONF} DEFAULT volume_group ${RET}