Bug#775279: unblock: cinder/2014.1.3-11
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
The last 3 uploads of Cinder to Sid are correcting a few issues.
1/ Package is rebuilt against openstack-pkg-tools >= 22~ to fix the
last systemd issue that was preventing startup of daemons on the first
install (see unblock bug #775278).
2/ For consistency with other OpenStack packages and to allow a better
compatibility with official puppet scripts, the postinst doesn't touch
the db connection directive and doesn't do the "cinder-manage db sync"
unless explicitely requested by the user through debconf.
3/ The package wasn't updated to use the correct database connection
directive, so version 2014.1.3-11 corrects that.
Please unblock cinder/2014.1.3-11, debdiff attached.
Cheers,
Thomas Goirand (zigo)
P.S: Please note that I only generate debdiff for the changes which
haven't been agreed on previously.
diff -Nru cinder-2014.1.3/debian/changelog cinder-2014.1.3/debian/changelog
--- cinder-2014.1.3/debian/changelog 2015-01-05 16:39:26.000000000 +0000
+++ cinder-2014.1.3/debian/changelog 2015-01-13 11:09:59.000000000 +0000
@@ -1,3 +1,23 @@
+cinder (2014.1.3-11) unstable; urgency=medium
+
+ * Using the correct [database]/connection directive instead of the deprecated
+ one.
+
+ -- Thomas Goirand <zigo@debian.org> Tue, 13 Jan 2015 12:08:22 +0100
+
+cinder (2014.1.3-10) unstable; urgency=medium
+
+ * Calling pkgos_dbc_postinst and cinder-manage db sync only if
+ cinder/configure_db is set to true.
+
+ -- Thomas Goirand <zigo@debian.org> Thu, 08 Jan 2015 16:14:50 +0000
+
+cinder (2014.1.3-9) unstable; urgency=medium
+
+ * Rebuilt with openstack-pkg-tools (>= 22~): starts daemons on first install.
+
+ -- Thomas Goirand <zigo@debian.org> Thu, 08 Jan 2015 15:45:52 +0000
+
cinder (2014.1.3-8) unstable; urgency=medium
* Rebuild against openstack-pkg-tools >= 21~ to fix sysv-rc init scripts.
diff -Nru cinder-2014.1.3/debian/cinder-common.config.in cinder-2014.1.3/debian/cinder-common.config.in
--- cinder-2014.1.3/debian/cinder-common.config.in 2015-01-05 16:39:26.000000000 +0000
+++ cinder-2014.1.3/debian/cinder-common.config.in 2015-01-13 11:09:59.000000000 +0000
@@ -8,7 +8,7 @@
#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 -Nru cinder-2014.1.3/debian/cinder-common.postinst.in cinder-2014.1.3/debian/cinder-common.postinst.in
--- cinder-2014.1.3/debian/cinder-common.postinst.in 2015-01-05 16:39:26.000000000 +0000
+++ cinder-2014.1.3/debian/cinder-common.postinst.in 2015-01-13 11:09:59.000000000 +0000
@@ -21,7 +21,10 @@
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 $@
+ db_get cinder/configure_db
+ if [ "$RET" = "true" ]; then
+ pkgos_dbc_postinst ${CINDER_CONF} database connection cinder $@
+ fi
pkgos_rabbit_write_conf ${CINDER_CONF} DEFAULT cinder
pkgos_write_admin_creds ${CINDER_CONF} keystone_authtoken cinder
db_get cinder/volume_group
@@ -29,11 +32,13 @@
pkgos_inifile set ${CINDER_CONF} DEFAULT volume_group ${RET}
fi
- db_stop
-
chmod 0440 /etc/sudoers.d/cinder-common
- echo "Now calling cinder-manage db sync: this may take a while..."
- su -s /bin/sh -c 'cinder-manage db sync' cinder
+ db_get cinder/configure_db
+ if [ "$RET" = "true" ]; then
+ echo "Now calling cinder-manage db sync: this may take a while..."
+ su -s /bin/sh -c 'cinder-manage db sync' cinder
+ fi
+ db_stop
fi
#DEBHELPER#
diff -Nru cinder-2014.1.3/debian/control cinder-2014.1.3/debian/control
--- cinder-2014.1.3/debian/control 2015-01-05 16:39:26.000000000 +0000
+++ cinder-2014.1.3/debian/control 2015-01-13 11:09:59.000000000 +0000
@@ -6,7 +6,7 @@
Gustavo Panizzo <gfa@zumbi.com.ar>
Build-Depends: debhelper (>= 9),
dh-systemd,
- openstack-pkg-tools (>= 21~),
+ openstack-pkg-tools (>= 22~),
po-debconf,
python-all (>= 2.6.6-3~),
python-pbr (>= 0.6),
Reply to: