Rewrote pkgos function calls order to match openstack-pkg-tools >= 4

diff --git a/debian/cinder-common.config.in b/debian/cinder-common.config.in
index 351167106cf37c692a87b134442afec983e2ee9a..d51e0c5e6677c1d7a299fe3cadfc91526a98e72b 100644 (file)
--- a/debian/cinder-common.config.in
+++ b/debian/cinder-common.config.in
@@ -10,7 +10,7 @@ CINDER_API=/etc/cinder/api-paste.ini
 #PKGOS-INCLUDE#
 
 manage_cinder_enable () {
-       pkgos_read_config -sh ${CINDER_COM_DEF} CINDER_ENABLE cinder/start_services
+       pkgos_read_config ${CINDER_COM_DEF} NO_SECTION CINDER_ENABLE cinder/start_services
        CINDER_ENABLE=${RET}
        if ! [ "${CINDER_ENABLE}" = "false" ] ; then
                CINDER_ENABLE=true
@@ -24,11 +24,11 @@ CINDER_ENABLE=${CINDER_ENABLE}" >${CINDER_COM_DEF}
 }
 
 pkgos_var_user_group cinder
-pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} cinder DEFAULT sql_connection $@
+pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} DEFAULT sql_connection cinder $@
 pkgos_read_admin_creds ${CINDER_API} cinder filter:authtoken
 manage_cinder_enable
 
-pkgos_get_config ${CINDER_CONF} volume_group DEFAULT
+pkgos_inifile get ${CINDER_CONF} DEFAULT volume_group
 if [ -n "${RET}" ] ; then
        db_set cinder/volume_group "${RET}"
 else

diff --git a/debian/cinder-common.postinst.in b/debian/cinder-common.postinst.in
index 0f6484cb09a8051057c8cacec2772b3dd5e3770d..22c628672c3ea62fbf84ae3088997ead14205d42 100644 (file)
--- a/debian/cinder-common.postinst.in
+++ b/debian/cinder-common.postinst.in
@@ -19,7 +19,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        pkgos_write_admin_creds ${CINDER_API} cinder filter:authtoken
        db_get cinder/volume_group
        if [ -n "${RET}" ] ; then
-               pkgos_edit_config volume_group ${RET} ${CINDER_CONF} DEFAULT
+               pkgos_inifile set ${CINDER_CONF} DEFAULT volume_group ${RET}
        fi
 
        db_stop