From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 12 Mar 2013 10:35:58 +0000 (+0800)
Subject: Rewrote pkgos function calls order to match openstack-pkg-tools >= 4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b0aef06b8922ab1e57b912e191e0690fe38d6ab4;p=openstack-build%2Fcinder-build.git

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

Rewritten-From: 6774f25e297ded7829c6bee2345fc16dc973233d
---

diff --git a/xenial/debian/cinder-common.config.in b/xenial/debian/cinder-common.config.in
index 351167106..d51e0c5e6 100644
--- a/xenial/debian/cinder-common.config.in
+++ b/xenial/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/xenial/debian/cinder-common.postinst.in b/xenial/debian/cinder-common.postinst.in
index 0f6484cb0..22c628672 100644
--- a/xenial/debian/cinder-common.postinst.in
+++ b/xenial/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