[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#775287: unblock: glance/2014.1.3-10



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release team,

Here is the list of changes.

*/ 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).

*/ To make sure the database directive is left unchanged unless the
user explicitely asked for automated management, and for consistency
across all OpenStack packages, the designate/configure_db debconf
directive default value is now set to false.

*/ 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 "designate-manage
database-init" and "designate-manage database-sync" unless explicitely
requested by the user through debconf. The pkgos_dbc_postinst isn't
called either if no db management is requested.

*/ For some reason, the database initialization was depending on the
dbc_upgrade variable, which is wrong: we really want the database to
be initialized at install time if designate/configure_db is true. This
upload corrects that too.

Please unblock glance/2014.1.3-10. 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 glance-2014.1.3/debian/changelog glance-2014.1.3/debian/changelog
--- glance-2014.1.3/debian/changelog	2015-01-05 21:57:57.000000000 +0000
+++ glance-2014.1.3/debian/changelog	2015-01-09 00:21:39.000000000 +0000
@@ -1,3 +1,23 @@
+glance (2014.1.3-10) unstable; urgency=medium
+
+  * Removed dbc_upgrade = true check before db_sync.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 09 Jan 2015 00:21:14 +0000
+
+glance (2014.1.3-9) unstable; urgency=medium
+
+  * Calls pkgos_dbc_postinst only if glance/configure_db is set to true (ie:
+    only if user asked for db handling).
+  * Sets glance/configure_db to false by default.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 08 Jan 2015 16:22:27 +0000
+
+glance (2014.1.3-8) unstable; urgency=medium
+
+  * Rebuilt with openstack-pkg-tools (>= 22~): starts daemons on first install.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 08 Jan 2015 15:51:51 +0000
+
 glance (2014.1.3-7) unstable; urgency=medium
 
   * Build-depends on openstack-pkg-tools (>= 21~) to ensure we have the
diff -Nru glance-2014.1.3/debian/control glance-2014.1.3/debian/control
--- glance-2014.1.3/debian/control	2015-01-05 21:57:57.000000000 +0000
+++ glance-2014.1.3/debian/control	2015-01-09 00:21:39.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Thomas Goirand <zigo@debian.org>
 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),
diff -Nru glance-2014.1.3/debian/glance-common.postinst.in glance-2014.1.3/debian/glance-common.postinst.in
--- glance-2014.1.3/debian/glance-common.postinst.in	2015-01-05 21:57:57.000000000 +0000
+++ glance-2014.1.3/debian/glance-common.postinst.in	2015-01-09 00:21:39.000000000 +0000
@@ -38,7 +38,10 @@
 	pkgos_write_new_conf glance policy.json
 
 	# Do the db creation using dbconfig-common
-	pkgos_dbc_postinst ${API_CONF} database connection glance $@
+	db_get glance/configure_db
+	if [ "$RET" = "true" ] ; then
+		pkgos_dbc_postinst ${API_CONF} database connection glance $@
+	fi
 
 	# Convert tables into utf8 if we're upgrading from prior to Icehouse.
 	db_get glance/configure_db
@@ -63,7 +66,7 @@
 
         # Upgrade or create the db if directed to do so
 	db_get glance/configure_db
-	if [ "$RET" = "true" ] && [ "$dbc_upgrade" = "true" ] ; then
+	if [ "$RET" = "true" ] ; then
 		echo "Now doing glance-manage db_sync: this may take a while..."
 		su glance -c "glance-manage db_sync" || true
 	fi
diff -Nru glance-2014.1.3/debian/glance-common.templates glance-2014.1.3/debian/glance-common.templates
--- glance-2014.1.3/debian/glance-common.templates	2015-01-05 21:57:57.000000000 +0000
+++ glance-2014.1.3/debian/glance-common.templates	2015-01-09 00:21:39.000000000 +0000
@@ -52,7 +52,7 @@
 
 Template: glance/configure_db
 Type: boolean
-Default: true
+Default: false
 _Description: Set up a database for Glance?
  No database has been set up for glance-registry or glance-api to use. Before
  continuing, you should make sure you have the following information:

Reply to: