Use separate debconf variables for the metadata server (Closes: #774792).

(cherry picked from commit 5c17e246c7e1ed00a7f58ba1be98ab0185d25b81)

Conflicts:
	debian/changelog

Rewritten-From: 8c807035e7d207ba73a118a77f0e10bd50bac1ac

diff --git a/xenial/debian/neutron-metadata-agent.config.in b/xenial/debian/neutron-metadata-agent.config.in
index 04896a6cfe37a380d20d2328bb730bc1fede343d..619ad4e249d065a558ce5ba05bc74088317154af 100644 (file)
--- a/xenial/debian/neutron-metadata-agent.config.in
+++ b/xenial/debian/neutron-metadata-agent.config.in
@@ -10,7 +10,7 @@ META_AGNT_CONF=/etc/neutron/metadata_agent.ini
 
 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 --git a/xenial/debian/neutron-metadata-agent.postinst.in b/xenial/debian/neutron-metadata-agent.postinst.in
index 77b040d260b6aeec32787ae0801fcb6e849e3783..3bef60374c7922c0383a331fdc4283d45da8ab78 100644 (file)
--- a/xenial/debian/neutron-metadata-agent.postinst.in
+++ b/xenial/debian/neutron-metadata-agent.postinst.in
@@ -7,7 +7,7 @@ CONF_FILE=/etc/neutron/metadata_agent.ini
 #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 [ "${1}" = "configure" ] ; then
        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 --git a/xenial/debian/neutron-metadata-agent.templates b/xenial/debian/neutron-metadata-agent.templates
index 98a49cf57bad396a1fd746204e6b8ce92aad066d..62cf1c05451429534d5f1ec4372ad7f7761a38c3 100644 (file)
--- a/xenial/debian/neutron-metadata-agent.templates
+++ b/xenial/debian/neutron-metadata-agent.templates
@@ -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: