Bug#944594: buster-pu: package heat/1:11.0.0-6
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@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/changelog 2019-03-01 15:35:44.000000000 +0100
+++ heat-11.0.0/debian/changelog 2019-11-12 10:52:30.000000000 +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 <zigo@debian.org> 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.in 2019-03-01 15:35:44.000000000 +0100
+++ heat-11.0.0/debian/heat-common.config.in 2019-11-12 10:52:30.000000000 +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.000000000 +0100
+++ heat-11.0.0/debian/heat-common.postinst.in 2019-11-12 10:52:30.000000000 +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.000000000 +0100
+++ heat-11.0.0/debian/heat-common.templates.in 2019-11-12 10:52:30.000000000 +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.000000000 +0100
+++ heat-11.0.0/debian/po/de.po 2019-11-12 10:52:30.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: heat\n"
"Report-Msgid-Bugs-To: heat@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 <toddy@debian.org>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\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
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Please enter domain name which will be used as heat domain."
msgstr ""
"Bitte geben Sie den Domain-Namen ein, der als Heat-Domain verwendet werden "
diff -Nru heat-11.0.0/debian/po/fr.po heat-11.0.0/debian/po/fr.po
--- heat-11.0.0/debian/po/fr.po 2019-03-01 15:35:44.000000000 +0100
+++ heat-11.0.0/debian/po/fr.po 2019-11-12 10:52:30.000000000 +0100
@@ -1,14 +1,14 @@
# Translation of heat debconf templates to French.
# Copyright (C) 2018, Debian French l10n team <debian-l10n-french@lists.debian.org>
# This file is distributed under the same license as the heat package.
-#
-#Translator:
-#Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2018.
+#
+# Translator:
+# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: heat\n"
"Report-Msgid-Bugs-To: heat@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-26 15:32+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -19,39 +19,53 @@
"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\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 "Identifiant de l'administrateur du domaine Heat :"
#. Type: string
#. Description
-#: ../heat-common.templates.in:1001
+#: ../heat-common.templates.in:2001
msgid "Please enter the username of the Heat domain administrator."
msgstr "Veuillez indiquer l'identifiant de l'administrateur du domaine Heat."
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Heat domain administrator password:"
msgstr "Mot de passe de l'administrateur du domaine Heat :"
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Please enter the password of the Heat domain administrator."
msgstr "Veuillez choisir le mot de passe de l'administrateur du domaine Heat."
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Heat domain:"
msgstr "Domaine Heat :"
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Please enter domain name which will be used as heat domain."
msgstr ""
"Veuillez indiquer le nom de domaine qui sera utilisé comme domaine Heat."
diff -Nru heat-11.0.0/debian/po/nl.po heat-11.0.0/debian/po/nl.po
--- heat-11.0.0/debian/po/nl.po 2019-03-01 15:35:44.000000000 +0100
+++ heat-11.0.0/debian/po/nl.po 2019-11-12 10:52:30.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: heat 1_11.0.0-3\n"
"Report-Msgid-Bugs-To: heat@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-12-03 21:09+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -18,38 +18,52 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\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 "Gebruikersnaam van de beheerder van het Heat-domein:"
#. Type: string
#. Description
-#: ../heat-common.templates.in:1001
+#: ../heat-common.templates.in:2001
msgid "Please enter the username of the Heat domain administrator."
msgstr "Voer de gebruikersnaam in van de beheerder van het Heat-domein."
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Heat domain administrator password:"
msgstr "Wachtwoord van de beheerder van het Heat-domein:"
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Please enter the password of the Heat domain administrator."
msgstr "Voer het wachtwoord in van de beheerder van het Heat-domein."
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Heat domain:"
msgstr "Heat-domein:"
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Please enter domain name which will be used as heat domain."
msgstr "Voer de domeinnaam in die gebruikt zal worden als Heat-domein."
diff -Nru heat-11.0.0/debian/po/pt.po heat-11.0.0/debian/po/pt.po
--- heat-11.0.0/debian/po/pt.po 2019-03-01 15:35:44.000000000 +0100
+++ heat-11.0.0/debian/po/pt.po 2019-11-12 10:52:30.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: heat 1:11.0.0-4\n"
"Report-Msgid-Bugs-To: heat@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: 2019-01-04 21:28+0000\n"
"Last-Translator: Rui Branco - DebianPT <ruipb_at_debianpt.org>\n"
"Language-Team: Portuguese <traduz_at_debianpt.org>\n"
@@ -17,39 +17,53 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Nome do administrador do domínio Heat:"
#. Type: string
#. Description
-#: ../heat-common.templates.in:1001
+#: ../heat-common.templates.in:2001
msgid "Please enter the username of the Heat domain administrator."
msgstr "Por favor introduza o nome de administrador do domínio Heat."
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Heat domain administrator password:"
msgstr "Palavra-chave do administrador de domínio Heat:"
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Please enter the password of the Heat domain administrator."
msgstr "Por favor introduza a palavra-chave do administrador Heat."
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Heat domain:"
msgstr "Domínio Heat:"
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Please enter domain name which will be used as heat domain."
-msgstr "Por favor introduza o nome de domínio que será usado como domínio Heat."
-
+msgstr ""
+"Por favor introduza o nome de domínio que será usado como domínio Heat."
diff -Nru heat-11.0.0/debian/po/templates.pot heat-11.0.0/debian/po/templates.pot
--- heat-11.0.0/debian/po/templates.pot 2019-03-01 15:35:44.000000000 +0100
+++ heat-11.0.0/debian/po/templates.pot 2019-11-12 10:52:30.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: heat\n"
"Report-Msgid-Bugs-To: heat@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: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,38 +17,52 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\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 ""
#. Type: string
#. Description
-#: ../heat-common.templates.in:1001
+#: ../heat-common.templates.in:2001
msgid "Please enter the username of the Heat domain administrator."
msgstr ""
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Heat domain administrator password:"
msgstr ""
#. Type: password
#. Description
-#: ../heat-common.templates.in:2001
+#: ../heat-common.templates.in:3001
msgid "Please enter the password of the Heat domain administrator."
msgstr ""
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Heat domain:"
msgstr ""
#. Type: string
#. Description
-#: ../heat-common.templates.in:3001
+#: ../heat-common.templates.in:4001
msgid "Please enter domain name which will be used as heat domain."
msgstr ""
Reply to: