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 d51e0c5e6677c1d7a299fe3cadfc91526a98e72b..4dc16f22a2fac8dac0f8a304949b229f1ab08ac1 100644 (file)
--- 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 22c628672c3ea62fbf84ae3088997ead14205d42..c09f6d1cd7a993e0f5b669984463a074f85fcd1e 100644 (file)
--- 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}