Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Dear release team, Here's the changes for this version: */ Before version 2014.1.3-11, neutron-metadata-agent was using the same Debconf templates as neutron-server. Unfortunately, a user reported that it was really annoying for him, as he used a puppet script that was only using /etc/neutron/metadata_agent.ini and never populating the /etc/neutron/neutron.conf file. Therefore, this version 2014.1.3-11 is changing the debconf template name from Template: neutron/* to Template: neutron-metadata/*, which fixes the issue. Please see #774788 for more details. So the below files where fixed for this: - debian/neutron-metadata-agent.config.in - debian/neutron-metadata-agent.postinst.in - debian/neutron-metadata-agent.templates The text of the templates didn't change, so it shouldn't be an issue for translations. */ 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). */ Upload of version 2014.1.3-10 closed the wrong bug, I corrected the changelog. I'll be watching the BTS to make sure of correctness. Please unblock neutron/2014.1.3-11, debdiff attached. Cheers, Thomas Goirand (zigo)
diff -Nru neutron-2014.1.3/debian/changelog neutron-2014.1.3/debian/changelog --- neutron-2014.1.3/debian/changelog 2015-01-07 23:10:06.000000000 +0000 +++ neutron-2014.1.3/debian/changelog 2015-01-08 15:35:33.000000000 +0000 @@ -1,6 +1,14 @@ +neutron (2014.1.3-11) unstable; urgency=medium + + * Use separate debconf variables for the metadata server (Closes: #774788). + * Rebuilding with openstack-pkg-tools (>= 22~) to make sure daemons are + started automatically at first install. + + -- Thomas Goirand <[email protected]> Thu, 08 Jan 2015 14:16:37 +0000 + neutron (2014.1.3-10) unstable; urgency=medium - * Sets neutron/configure_db default value to false (Closes: #770944). + * Sets neutron/configure_db default value to false (Closes: #774792). -- Thomas Goirand <[email protected]> Thu, 08 Jan 2015 00:05:56 +0100 diff -Nru neutron-2014.1.3/debian/control neutron-2014.1.3/debian/control --- neutron-2014.1.3/debian/control 2015-01-07 23:10:06.000000000 +0000 +++ neutron-2014.1.3/debian/control 2015-01-08 15:35:33.000000000 +0000 @@ -7,7 +7,7 @@ Mehdi Abaakouk <[email protected]> Build-Depends: debhelper (>= 9), dh-systemd, - openstack-pkg-tools (>= 21~), + openstack-pkg-tools (>= 22~), po-debconf, python-all (>= 2.6), python-pbr (>= 0.6), diff -Nru neutron-2014.1.3/debian/neutron-metadata-agent.config.in neutron-2014.1.3/debian/neutron-metadata-agent.config.in --- neutron-2014.1.3/debian/neutron-metadata-agent.config.in 2015-01-07 23:10:06.000000000 +0000 +++ neutron-2014.1.3/debian/neutron-metadata-agent.config.in 2015-01-08 15:35:33.000000000 +0000 @@ -10,7 +10,7 @@ pkgos_var_user_group neutron chmod 755 /var/lib/neutron -pkgos_read_admin_creds ${META_AGNT_CONF} DEFAULT neutron -pkgos_read_config ${META_AGNT_CONF} DEFAULT auth_region neutron/region-name +pkgos_read_admin_creds ${META_AGNT_CONF} DEFAULT neutron-metadata +pkgos_read_config ${META_AGNT_CONF} DEFAULT auth_region neutron-metadata/region-name exit 0 diff -Nru neutron-2014.1.3/debian/neutron-metadata-agent.postinst.in neutron-2014.1.3/debian/neutron-metadata-agent.postinst.in --- neutron-2014.1.3/debian/neutron-metadata-agent.postinst.in 2015-01-07 23:10:06.000000000 +0000 +++ neutron-2014.1.3/debian/neutron-metadata-agent.postinst.in 2015-01-08 15:35:33.000000000 +0000 @@ -7,7 +7,7 @@ #PKGOS-INCLUDE# manage_metadata_region () { - db_get neutron/region-name + db_get neutron-metadata/region-name if [ -n "${RET}" ] ; then pkgos_inifile set ${CONF_FILE} DEFAULT auth_region ${RET} fi @@ -21,7 +21,7 @@ if [ ! -e ${CONF_FILE} ] ; then install -D -m 0640 -o neutron -g neutron /usr/share/neutron-metadata-agent/metadata_agent.ini ${CONF_FILE} fi - pkgos_write_admin_creds ${CONF_FILE} DEFAULT neutron + pkgos_write_admin_creds ${CONF_FILE} DEFAULT neutron-metadata manage_metadata_region db_stop fi diff -Nru neutron-2014.1.3/debian/neutron-metadata-agent.templates neutron-2014.1.3/debian/neutron-metadata-agent.templates --- neutron-2014.1.3/debian/neutron-metadata-agent.templates 2015-01-07 23:10:06.000000000 +0000 +++ neutron-2014.1.3/debian/neutron-metadata-agent.templates 2015-01-08 15:35:33.000000000 +0000 @@ -7,28 +7,28 @@ # Even minor modifications require translation updates and such # changes should be coordinated with translators and reviewers. -Template: neutron/auth-host +Template: neutron-metadata/auth-host Type: string Default: 127.0.0.1 _Description: Auth server hostname: Please specify the URL of your Neutron authentication server. Typically this is also the URL of your OpenStack Identity Service (Keystone). -Template: neutron/admin-tenant-name +Template: neutron-metadata/admin-tenant-name Type: string Default: admin _Description: Auth server tenant name: -Template: neutron/admin-user +Template: neutron-metadata/admin-user Type: string Default: admin _Description: Auth server username: -Template: neutron/admin-password +Template: neutron-metadata/admin-password Type: password _Description: Auth server password: -Template: neutron/region-name +Template: neutron-metadata/region-name Type: string Default: regionOne _Description: Name of the region to be used by the metadata server:
