Bug#944594: buster-pu: package heat/1:11.0.0-6

[Thomas Goirand]

On 11/23/19 6:36 PM, Julien Cristau wrote:
> Control: tag -1 moreinfo
> 
> On Tue, Nov 12, 2019 at 11:12:17AM +0100, Thomas Goirand wrote:
>> I'd like to update heat in Buster to permit safe upgrades, as the current
>> version may remove the heat domain password. Attached is the proposed
>> debdiff for this fix.
>>
> I don't understand why this requires a new template.  That seems wrong
> to me.
> 
> Cheers,
> Julien

The password isn't recorded in the debconf db (ie: db_unregister), and
prompted as empty when there's an upgrade. This template avoids any
prompting at all, so fixes the non-interactive upgrade, while keeping
the feature of being able to install all of OpenStack by only
interacting with debconf.

Thomas

Bug#944594: buster-pu: package heat/1:11.0.0-6

[Julien Cristau]

Control: tag -1 moreinfo

On Tue, Nov 12, 2019 at 11:12:17AM +0100, Thomas Goirand wrote:
> I'd like to update heat in Buster to permit safe upgrades, as the current
> version may remove the heat domain password. Attached is the proposed
> debdiff for this fix.
> 
I don't understand why this requires a new template.  That seems wrong
to me.

Cheers,
Julien

Bug#944594: buster-pu: package heat/1:11.0.0-6

[Thomas Goirand]

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian@packages.debian.org
Usertags: pu

Dear release team,

I'd like to update heat in Buster to permit safe upgrades, as the current
version may remove the heat domain password. Attached is the proposed
debdiff for this fix.

Note that I've tested the upgrade in production.

Cheers,

Thomas Goirand (zigo)
diff -Nru heat-11.0.0/debian/changelog heat-11.0.0/debian/changelog
--- heat-11.0.0/debian/changelog2019-03-01 15:35:44.0 +0100
+++ heat-11.0.0/debian/changelog2019-11-12 10:52:30.0 +0100
@@ -1,3 +1,11 @@
+heat (1:11.0.0-6+bpo10+1) buster; urgency=medium
+
+  * Add debconf screen to enable / disable configuring heat's domain through
+debconf, avoiding many screens and eventually writing unwanted empty
+password to the configuration file.
+
+ -- Thomas Goirand   Tue, 12 Nov 2019 10:52:30 +0100
+
 heat (1:11.0.0-6) unstable; urgency=medium
 
   * Install heat-api and heat-api-cfn using uwsgi.
diff -Nru heat-11.0.0/debian/heat-common.config.in 
heat-11.0.0/debian/heat-common.config.in
--- heat-11.0.0/debian/heat-common.config.in2019-03-01 15:35:44.0 
+0100
+++ heat-11.0.0/debian/heat-common.config.in2019-11-12 10:52:30.0 
+0100
@@ -24,6 +24,13 @@
 pkgos_dbc_read_conf -pkg heat-common ${CONF} database connection heat $@
 pkgos_rabbit_read_conf ${CONF} oslo_messaging_rabbit heat
 pkgos_read_admin_creds ${CONF} keystone_authtoken heat
-read_heat_domain
+
+db_input high heat/configure_with_debconf || true
+db_go || true
+db_get heat/configure_with_debconf
+if [ "${RET}" = "true" ] ; then
+   read_heat_domain
+fi
+db_go
 
 exit 0
diff -Nru heat-11.0.0/debian/heat-common.postinst.in 
heat-11.0.0/debian/heat-common.postinst.in
--- heat-11.0.0/debian/heat-common.postinst.in  2019-03-01 15:35:44.0 
+0100
+++ heat-11.0.0/debian/heat-common.postinst.in  2019-11-12 10:52:30.0 
+0100
@@ -120,7 +120,11 @@
pkgos_write_new_conf heat heat.conf
pkgos_write_new_conf heat policy.json
 
-   manage_domain_config
+   db_get heat/configure_with_debconf
+   if [ "${RET}" = "true" ] ; then
+   manage_domain_config
+   fi
+   db_unregister heat/configure_with_debconf
 
db_get heat/configure_db
if [ "$RET" = "true" ] ; then
diff -Nru heat-11.0.0/debian/heat-common.templates.in 
heat-11.0.0/debian/heat-common.templates.in
--- heat-11.0.0/debian/heat-common.templates.in 2019-03-01 15:35:44.0 
+0100
+++ heat-11.0.0/debian/heat-common.templates.in 2019-11-12 10:52:30.0 
+0100
@@ -1,3 +1,10 @@
+Template: heat/configure_with_debconf
+Type: boolean
+Default: false
+_Description: Configure Heat domain with debconf?
+ Heat domain must be configured to connect to Keystone. Specify this should be
+ configured through debconf.
+
 Template: heat/heat_domain_admin_username
 Type: string
 Default: heat_domain_admin
diff -Nru heat-11.0.0/debian/po/de.po heat-11.0.0/debian/po/de.po
--- heat-11.0.0/debian/po/de.po 2019-03-01 15:35:44.0 +0100
+++ heat-11.0.0/debian/po/de.po 2019-11-12 10:52:30.0 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: heat\n"
 "Report-Msgid-Bugs-To: h...@packages.debian.org\n"
-"POT-Creation-Date: 2018-11-21 13:32+0100\n"
+"POT-Creation-Date: 2019-11-12 10:53+0100\n"
 "PO-Revision-Date: 2018-11-25 10:28+0100\n"
 "Last-Translator: Dr. Tobias Quathamer \n"
 "Language-Team: German \n"
@@ -17,39 +17,53 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#. Type: string
+#. Type: boolean
+#. Description
+#: ../heat-common.templates.in:1001
+msgid "Configure Heat domain with debconf?"
+msgstr ""
+
+#. Type: boolean
 #. Description
 #: ../heat-common.templates.in:1001
+msgid ""
+"Heat domain must be configured to connect to Keystone. Specify this should "
+"be configured through debconf."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../heat-common.templates.in:2001
 msgid "Heat domain administrator username:"
 msgstr "Benutzername des Heat-Domain-Administrators:"
 
 #. Type: string
 #. Description
-#: ../heat-common.templates.in:1001
+#: ../heat-common.templates.in:2001
 msgid "Please enter the username of the Heat domain administrator."
 msgstr "Bitte geben Sie den Benutzernamen des Heat-Domain-Administrators ein."
 
 #. Type: password
 #. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
 msgid "Heat domain administrator password:"
 msgstr "Passwort des Heat-Domain-Administrators:"
 
 #. Type: password
 #. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
 msgid "Please enter the password of the Heat domain administrator."
 msgstr "Bitte geben Sie das Passwort des Heat-Domain-Administrators ein."
 
 #. Type: string
 #. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
 msgid "Heat domain:"
 msgstr "Heat-Domain:"
 
 #. Type: string