From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 4 Feb 2015 10:06:15 +0000 (+0100)
Subject: Added code to handle the nova credentials in neutron and the metadata_proxy_shared_secret
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d437ceb4de478f80d4dbb688e2abba72ef305055;p=openstack-build%2Fneutron-build.git

Added code to handle the nova credentials in neutron and the metadata_proxy_shared_secret

Rewritten-From: ceb747155a8a5c14fea0950ef8fa78c77f24dcb5
---

diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in
index 0c05f8fd1..b712fbd32 100644
--- a/xenial/debian/neutron-common.config.in
+++ b/xenial/debian/neutron-common.config.in
@@ -84,6 +84,14 @@ db_go
 db_get neutron/plugin-select
 NEUTRON_PLUGIN_NAME=${RET}
 
+read_nova_admin_credentials () {
+	pkgos_read_config -p high ${N_CONF} DEFAULT nova_url neutron/nova_url
+	pkgos_read_config -p high ${N_CONF} DEFAULT nova_region_name neutron/nova_region
+	pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_tenant_id neutron/nova_admin_tenant_id
+	pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_username neutron/nova_admin_username
+	pkgos_read_config -p high ${N_CONF} DEFAULT nova_admin_password neutron/nova_admin_password
+}
+
 # OVS specific configurations (if that's the one selected)
 if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
 	# Various network config...
@@ -91,6 +99,8 @@ if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
 	pkgos_read_config ${OVS_CONF} OVS enable_tunneling      neutron/enable_tunneling
 	pkgos_read_config ${OVS_CONF} OVS tunnel_id_ranges      neutron/tunnel_id_ranges
 
+	read_nova_admin_credentials
+
 	# Guess values to put in the local_ip directive
 	IF=`LC_ALL=C route | grep default |awk -- '{ print $8 }'`
 	guessed_ip_addr=`LC_ALL=C ifconfig ${IF} | grep 'inet addr' | sed 's/.\+inet addr:\([0-9.]\+\).\+/\1/'`
diff --git a/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in
index d153810c1..2193a96ac 100644
--- a/xenial/debian/neutron-common.postinst.in
+++ b/xenial/debian/neutron-common.postinst.in
@@ -57,6 +57,19 @@ neutron_core_plugin_class () {
 	esac
 }
 
+write_nova_admin_credentials () {
+        db_get neutron/nova_url
+	pkgos_inifile set ${N_CONF} DEFAULT nova_url ${RET}
+	db_get neutron/nova_region
+	pkgos_inifile set ${N_CONF} DEFAULT nova_region_name ${RET}
+	db_get neutron/nova_admin_tenant_id
+	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_tenant_id ${RET}
+	db_get neutron/nova_admin_username
+	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_username ${RET}
+	db_get neutron/nova_admin_password
+	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_password ${RET}
+}
+
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	. /usr/share/debconf/confmodule
 
@@ -108,6 +121,8 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 		db_get neutron/local_ip
 		pkgos_inifile set ${OVS_CONF} OVS local_ip "${RET}"
 	fi
+
+	write_nova_admin_credentials
 	db_stop
 
 	chown -R neutron:adm /var/log/neutron/
diff --git a/xenial/debian/neutron-common.templates b/xenial/debian/neutron-common.templates
index d70480bdf..bda27e084 100644
--- a/xenial/debian/neutron-common.templates
+++ b/xenial/debian/neutron-common.templates
@@ -126,3 +126,35 @@ Template: neutron/local_ip
 Type: string
 _Description: Local IP address of this hypervisor:
  Please enter the local IP address for this hypervisor.
+
+Template: neutron/nova_url
+Type: string
+Default: http://127.0.0.1:8774/v2
+_Description: Nova server URL:
+ Please enter the URL of the Nova server.
+
+Template: neutron/nova_region
+Type: string
+Default: regionOne
+_Description: Nova server region name:
+ Please enter the region of the Nova server.
+
+Template: neutron/nova_admin_tenant_id
+Type: string
+Default: admin
+_Description: Nova admin tenant ID:
+ Neutron needs to be able to communicate with Nova through Keystone. Therefore
+ Neutron needs to know the Nova admin tenant ID, username and password.
+ .
+ Please enter the ID of the admin tenant for Nova.
+
+Template: neutron/nova_admin_username
+Type: string
+Default: admin
+_Description: Neutron administrator username:
+ Please enter the username of the Nova administrator.
+
+Template: neutron/nova_admin_password
+Type: password
+_Description: Nova administrator password:
+ Please enter the password of the Nova administrator.
diff --git a/xenial/debian/neutron-metadata-agent.config.in b/xenial/debian/neutron-metadata-agent.config.in
index 619ad4e24..9a3549374 100644
--- a/xenial/debian/neutron-metadata-agent.config.in
+++ b/xenial/debian/neutron-metadata-agent.config.in
@@ -12,5 +12,6 @@ pkgos_var_user_group neutron
 chmod 755 /var/lib/neutron
 pkgos_read_admin_creds ${META_AGNT_CONF} DEFAULT neutron-metadata
 pkgos_read_config ${META_AGNT_CONF} DEFAULT auth_region neutron-metadata/region-name
+pkgos_read_config -p high ${META_AGNT_CONF} DEFAULT metadata_proxy_shared_secret neutron-metadata/metadata_secret
 
 exit 0
diff --git a/xenial/debian/neutron-metadata-agent.postinst.in b/xenial/debian/neutron-metadata-agent.postinst.in
index 3bef60374..3b944f240 100644
--- a/xenial/debian/neutron-metadata-agent.postinst.in
+++ b/xenial/debian/neutron-metadata-agent.postinst.in
@@ -13,6 +13,11 @@ manage_metadata_region () {
 	fi
 }
 
+manage_metadata_proxy_shared_secret () {
+	db_get neutron-metadata/metadata_secret
+	pkgos_inifile set ${CONF_FILE} DEFAULT metadata_proxy_shared_secret ${RET}
+}
+
 if [ "${1}" = "configure" ] ; then
 	. /usr/share/debconf/confmodule
 	pkgos_var_user_group neutron
@@ -23,6 +28,7 @@ if [ "${1}" = "configure" ] ; then
 	fi
 	pkgos_write_admin_creds ${CONF_FILE} DEFAULT neutron-metadata
 	manage_metadata_region
+	manage_metadata_proxy_shared_secret
 	db_stop
 fi
 
diff --git a/xenial/debian/neutron-metadata-agent.templates b/xenial/debian/neutron-metadata-agent.templates
index 62cf1c054..2e9246901 100644
--- a/xenial/debian/neutron-metadata-agent.templates
+++ b/xenial/debian/neutron-metadata-agent.templates
@@ -34,3 +34,15 @@ Default: regionOne
 _Description: Name of the region to be used by the metadata server:
  Openstack can be used using availability zones, with each region representing
  a location. Please enter the zone that the metadata server should use.
+
+Template: neutron-metadata/metadata_secret
+Type: password
+_Description: Metadata proxy shared secret:
+ VM instances using Neutron to handle networking retrieve their metadata
+ through the Neutron metadata agent, which serves as a proxy to the Nova
+ metadata REST API server.
+ .
+ Please enter the password that should be used to protect communications
+ between the Neutron metadata proxy agent and the Nova metadata server. The
+ same shared password should be used when setting up the nova-common
+ package.
diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po
index 2dcfc2b57..d04a1e0c4 100644
--- a/xenial/debian/po/da.po
+++ b/xenial/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2014-10-18 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -29,8 +29,8 @@ msgid ""
 "Please specify the hostname of your Neutron authentication server. Typically "
 "this is also the hostname of your OpenStack Identity Service (Keystone)."
 msgstr ""
-"Angiv venligst værtsnavnet for din Neutron-godkendelseserver. Dette er typisk "
-"også værtsnavnet for din OpenStack Identity Service (Keystone)."
+"Angiv venligst værtsnavnet for din Neutron-godkendelseserver. Dette er "
+"typisk også værtsnavnet for din OpenStack Identity Service (Keystone)."
 
 #. Type: string
 #. Description
@@ -56,8 +56,7 @@ msgstr "Brugernavn for godkendelsesserveren:"
 #. Description
 #: ../neutron-common.templates:4001
 msgid "Please specify the username to use with the authentication server."
-msgstr ""
-"Angiv venligst brugernavnet der skal bruges med godkendelsesserveren."
+msgstr "Angiv venligst brugernavnet der skal bruges med godkendelsesserveren."
 
 #. Type: password
 #. Description
@@ -69,8 +68,7 @@ msgstr "Adgangskode for godkendelsesserveren:"
 #. Description
 #: ../neutron-common.templates:5001
 msgid "Please specify the password to use with the authentication server."
-msgstr ""
-"Angiv venligst adgangskoden for brug med godkendelsesserveren."
+msgstr "Angiv venligst adgangskoden for brug med godkendelsesserveren."
 
 #. Type: select
 #. Choices
@@ -132,12 +130,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -178,11 +170,11 @@ msgid ""
 "starting the neutron-server daemon. Also, the core_plugin directive needs to "
 "match. Please select which plugin to use."
 msgstr ""
-"Neutron anvender en arkitektur med udvidelsesmoduler til at håndtere netværk. "
-"Når du starter Neutrons serverdæmon, skal konfigurationsfilen, der svarer til "
-"udvidelsesmodulet, du ønsker at bruge, indlæses ved at give det en parameter når "
-"neturon-server-dæmonen startes. Direktivet core_plugin skal også matche. Vælg "
-"venligst hvilket udvidelsesmodul du ønsker at bruge."
+"Neutron anvender en arkitektur med udvidelsesmoduler til at håndtere "
+"netværk. Når du starter Neutrons serverdæmon, skal konfigurationsfilen, der "
+"svarer til udvidelsesmodulet, du ønsker at bruge, indlæses ved at give det "
+"en parameter når neturon-server-dæmonen startes. Direktivet core_plugin skal "
+"også matche. Vælg venligst hvilket udvidelsesmodul du ønsker at bruge."
 
 #. Type: boolean
 #. Description
@@ -197,8 +189,8 @@ msgid ""
 "No database has been set up for Neutron to use. Before continuing, you "
 "should make sure you have the following information:"
 msgstr ""
-"Ingen database er blevet opsat for Neutron. Før du fortsætter skal du "
-"sikre dig, at du har den følgende information:"
+"Ingen database er blevet opsat for Neutron. Før du fortsætter skal du sikre "
+"dig, at du har den følgende information:"
 
 #. Type: boolean
 #. Description
@@ -285,7 +277,8 @@ msgstr "Adgangskode for forbindelsen til RabbitMQ-serveren:"
 #. Description
 #: ../neutron-common.templates:10001
 msgid "Please specify the password used to connect to the RabbitMQ server."
-msgstr "Angiv venligst adgangskoden brugt til at forbinde til RabbitMQ-serveren:"
+msgstr ""
+"Angiv venligst adgangskoden brugt til at forbinde til RabbitMQ-serveren:"
 
 #. Type: select
 #. Choices
@@ -341,11 +334,11 @@ msgid ""
 "choose \"gre\" and then configure \"tunnel_id_ranges\". Choose \"none\" to "
 "disable creation of tenant networks."
 msgstr ""
-"Værdien »lokal« er kun nyttig for single-box-test. For at tenant-netværk kan"
-"tilbyde forbindelse mellem værter, er det nødvendigt at vælge enten »vlan« og "
-"så konfigurere »network_vlan_ranges« eller at vælge »gre« og så konfigurere "
-"»tunnel_id_ranges«. Vælg »ingen« for at deaktivere oprettelsen af tenant-"
-"netværk."
+"Værdien »lokal« er kun nyttig for single-box-test. For at tenant-netværk "
+"kantilbyde forbindelse mellem værter, er det nødvendigt at vælge enten "
+"»vlan« og så konfigurere »network_vlan_ranges« eller at vælge »gre« og så "
+"konfigurere »tunnel_id_ranges«. Vælg »ingen« for at deaktivere oprettelsen "
+"af tenant-netværk."
 
 #. Type: boolean
 #. Description
@@ -362,8 +355,8 @@ msgid ""
 "tunneling."
 msgstr ""
 "Angiv venligst om understøttelse skal aktiveres for GRE-netværk på serveren "
-"og agenterne. Dette kræver kerneunderstøttelse for OVS-rettelsesporte og "
-"GRE-tunnelstøtte."
+"og agenterne. Dette kræver kerneunderstøttelse for OVS-rettelsesporte og GRE-"
+"tunnelstøtte."
 
 #. Type: string
 #. Description
@@ -379,9 +372,9 @@ msgid ""
 "enumerating ranges of GRE tunnel IDs that are available for tenant network "
 "allocation if tenant_network_type is \"gre\"."
 msgstr ""
-"Angiv en kommaadskilt liste med <tun_min>:<tun_max>-tupleroptællingsintervaller "
-"for GRE-tunnel-id'er som er tilgængelige for tenant-netværksallokering hvis "
-"tenant_network_type er »gre«."
+"Angiv en kommaadskilt liste med <tun_min>:<tun_max>-"
+"tupleroptællingsintervaller for GRE-tunnel-id'er som er tilgængelige for "
+"tenant-netværksallokering hvis tenant_network_type er »gre«."
 
 #. Type: string
 #. Description
@@ -395,6 +388,87 @@ msgstr "Lokal IP-adresse for denne hypervisor:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Angiv den lokale IP-adresse for denne hypervisor."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Angiv venligst IP-adressen for den server."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "»Tenant«-navn for godkendelseserver:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Angiv venligst IP-adressen for den server."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Brugernavn for godkendelsesserver:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr "Angiv venligst brugernavnet der skal bruges med godkendelsesserveren."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr "Angiv venligst adgangskoden for brug med godkendelsesserveren."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -476,8 +550,8 @@ msgid ""
 "address."
 msgstr ""
 "Denne IP-adresse skal være tilgængelig fra klienterne, som vil bruge denne "
-"tjeneste, så hvis du installerer en offentlig sky, skal dette være en offentlig "
-"IP-adresse."
+"tjeneste, så hvis du installerer en offentlig sky, skal dette være en "
+"offentlig IP-adresse."
 
 #. Type: string
 #. Description
@@ -493,8 +567,9 @@ msgid ""
 "location. Please enter the zone that you wish to use when registering the "
 "endpoint."
 msgstr ""
-"OpenStack understøtter tilgængelighedszoner, hvor hver regioner repræsenterer "
-"et sted. Indtast venligst zonen du øsnker at bruge når slutpunktet registreres."
+"OpenStack understøtter tilgængelighedszoner, hvor hver regioner "
+"repræsenterer et sted. Indtast venligst zonen du øsnker at bruge når "
+"slutpunktet registreres."
 
 #. Type: string
 #. Description
@@ -509,8 +584,8 @@ msgid ""
 "Please specify the URL of your Neutron authentication server. Typically this "
 "is also the URL of your OpenStack Identity Service (Keystone)."
 msgstr ""
-"Angiv venligst adressen for din Neutron-godkendelsesserver. Typisk er "
-"dette også adressen for din OpenStack identity Service (Keystone)."
+"Angiv venligst adressen for din Neutron-godkendelsesserver. Typisk er dette "
+"også adressen for din OpenStack identity Service (Keystone)."
 
 #. Type: string
 #. Description
@@ -546,3 +621,30 @@ msgid ""
 msgstr ""
 "OpenStack kan anvendes af tilgængeligehedszoner. Hver region repræsenterer "
 "en plads. Indtast venligst zonen som metadataserveren skal bruge."
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/de.po b/xenial/debian/po/de.po
index 984a0f1d0..71805b877 100644
--- a/xenial/debian/po/de.po
+++ b/xenial/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2013.2.1-3\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2014-02-11 23:31+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -397,6 +397,91 @@ msgstr "Lokale IP-Adresse dieses Hypervisors:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Bitte geben Sie die lokale IP-Adresse dieses Hypervisors ein."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Bitte geben Sie die IP-Adresse dieses Servers an."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Tenant-Name des Authentifizierungsservers:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Bitte geben Sie die IP-Adresse dieses Servers an."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Benutzername des Authentifizierungsservers:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+"Bitte geben Sie den Benutzernamen an, der für den Authentifizierungsserver "
+"benutzt wird."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr ""
+"Bitte geben Sie das Passwort an, das für den Authentifizierungsserver "
+"benutzt wird."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -556,5 +641,29 @@ msgstr ""
 "Region einen Ort repräsentiert. Bitte geben Sie die Zone an, die der "
 "Metadaten-Server benutzt."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/es.po b/xenial/debian/po/es.po
index 10385db96..7dd6c703f 100644
--- a/xenial/debian/po/es.po
+++ b/xenial/debian/po/es.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2013.2.1-1\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2013-12-23 16:41+0200\n"
 "Last-Translator: Camaleón <noelamac@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -408,6 +408,88 @@ msgstr "Dirección IP local de este hipervisor:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Introduzca la dirección IP local para este hipervisor."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Especifique la dirección IP de ese servidor."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Nombre del inquilino («tenant») del servidor de autenticación:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Especifique la dirección IP de ese servidor."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Nombre de usuario del servidor de autenticación:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+"Indique el nombre de usuario para usar con el servidor de autenticación."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr "Indique la contraseña para usar con del servidor de autenticación."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -564,5 +646,29 @@ msgstr ""
 "representa una ubicación. Introduzca la zona que desea que utilice el "
 "servidor de metadatos."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/fr.po b/xenial/debian/po/fr.po
index a1ceb82ee..6a0ae048b 100644
--- a/xenial/debian/po/fr.po
+++ b/xenial/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2013-10-31 11:05+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -397,6 +397,91 @@ msgstr "Adresse IP locale de cet hyperviseur :"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Veuillez indiquer l'adresse IP locale de cet hyperviseur."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Veuillez indiquer l'adresse IP de ce serveur."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Nom d'espace client du serveur d'authentification :"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Veuillez indiquer l'adresse IP de ce serveur."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Nom d'utilisateur du serveur d'authentification :"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+"Veuillez indiquer le nom d'utilisateur à utiliser sur le serveur "
+"d'authentification."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr ""
+"Veuillez indiquer le mot de passe à utiliser sur le serveur "
+"d'authentification."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -553,5 +638,29 @@ msgstr ""
 "représentant un lieu. Veuillez entrer la zone que le serveur de métadonnées "
 "devra utiliser."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/it.po b/xenial/debian/po/it.po
index aab947794..3c594e943 100644
--- a/xenial/debian/po/it.po
+++ b/xenial/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2014-04-21 09:44+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -389,6 +389,87 @@ msgstr "Indirizzo IP locale di questo ipervisore:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Inserire l'indirizzo IP locale di questo ipervisore."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Inserire l'indirizzo IP di tale server."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Nome del «locatario» («tenant») per il server di autenticazione:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Inserire l'indirizzo IP di tale server."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Nome utente per il server di autenticazione:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr "Specificare il nome utente da usare con il server di autenticazione."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr "Specificare la password da usare con il server di autenticazione."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -544,5 +625,29 @@ msgstr ""
 "regione che rappresenta una posizione. Inserire la zona che deve essere "
 "usata dal server di metadati."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/nl.po b/xenial/debian/po/nl.po
index b96063136..ef563e78f 100644
--- a/xenial/debian/po/nl.po
+++ b/xenial/debian/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-13 04:48+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2014-10-08 15:10+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -132,12 +132,6 @@ msgstr "Hyper-V"
 msgid "RYU"
 msgstr "RYU"
 
-#. Type: select
-#. Choices
-#: ../neutron-common.templates:6001
-msgid "ml2/ml2_conf.ini"
-msgstr "ml2/ml2_conf.ini"
-
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
@@ -403,6 +397,89 @@ msgstr "Lokale IP-adres van deze hypervisor:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Geef het lokale IP-adres op van deze hypervisor."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Gelieve het IP-adres van die server op te geven."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Naam van de clientruimte (tenant) op de authenticatieserver:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Gelieve het IP-adres van die server op te geven."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Gebruikersnaam op de authenticatieserver:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+"Vermeld de gebruikersnaam die op de authenticatieserver gebruikt zal worden."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr ""
+"Vermeld het wachtwoord dat op de authenticatieserver gebruikt zal worden."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -557,3 +634,30 @@ msgstr ""
 "Openstack kent het gebruik van zones van beschikbaarheid, waarbij elke regio "
 "een locatie vertegenwoordigt. Geef aan welke zone de metadataserver moet "
 "gebruiken."
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
+#~ msgid "ml2/ml2_conf.ini"
+#~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/pt.po b/xenial/debian/po/pt.po
index 0a2ac87da..d3ad3d248 100644
--- a/xenial/debian/po/pt.po
+++ b/xenial/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2013.2-4\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2013-11-18 23:23+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -395,6 +395,90 @@ msgstr "Endereço IP local deste hypervisor:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Por favor indique o endereço IP local deste hypervisor."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Por favor especifique o endereço IP desse servidor."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Nome \"tenant\" do servidor de autenticação:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Por favor especifique o endereço IP desse servidor."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Nome de utilizador do servidor de autenticação:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+"Por favor especifique o nome de utilizador a usar com o servidor de "
+"autenticação."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr ""
+"Por favor especifique a palavra passe a usar com o servidor de autenticação."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -552,5 +636,29 @@ msgstr ""
 "região a representar um local. Por favor indique a zona que o servidor de "
 "meta-dados deverá usar."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/ru.po b/xenial/debian/po/ru.po
index b67646a14..13c626221 100644
--- a/xenial/debian/po/ru.po
+++ b/xenial/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2014.1-2\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2014-05-04 09:17+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks@lists.sourceforge.net>\n"
@@ -383,6 +383,87 @@ msgstr "Локальный IP-адрес этого гипервизора:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Введите локальный IP-адрес этого гипервизора."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Укажите IP-адрес этого сервера."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Членское имя сервера аутентификации:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Укажите IP-адрес этого сервера."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Имя пользователя сервера аутентификации:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr "Введите имя пользователя для работы с сервером аутентификации."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr "Введите пароль для работы с сервером аутентификации."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -537,5 +618,29 @@ msgstr ""
 "область представляет определённое расположение. Введите зону, которую должен "
 "использовать сервер метаданных."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/sv.po b/xenial/debian/po/sv.po
index bcd1608a7..4325e4271 100644
--- a/xenial/debian/po/sv.po
+++ b/xenial/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+0100\n"
 "PO-Revision-Date: 2014-01-09 10:22+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -389,6 +389,89 @@ msgstr "Lokal IP-adress för denna hypervisor:"
 msgid "Please enter the local IP address for this hypervisor."
 msgstr "Ange den lokala IP-adressen för denna hypervisor."
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the URL of the Nova server."
+msgstr "Ange IP-adressen för den servern."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Auth server tenant name:"
+msgid "Nova server region name:"
+msgstr "Namn för \"tenant\" (administratör) på identifieringsservern:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+#, fuzzy
+#| msgid "Please specify the IP address of that server."
+msgid "Please enter the region of the Nova server."
+msgstr "Ange IP-adressen för den servern."
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Neutron administrator username:"
+msgstr "Användarnamn på identifieringsservern:"
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+#, fuzzy
+#| msgid "Please specify the username to use with the authentication server."
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+"Ange användarnamnet som ska användas för att komma åt identifieringsservern."
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+#, fuzzy
+#| msgid "Please specify the password to use with the authentication server."
+msgid "Please enter the password of the Nova administrator."
+msgstr ""
+"Ange lösenordet som ska användas för att komma åt identifieringsservern."
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -539,5 +622,29 @@ msgstr ""
 "OpenStack kan användas med tillgänglighetszoner. Varje region representerar "
 "en plats. Ange zonen som ska användas när ändpunkten registreras."
 
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"
diff --git a/xenial/debian/po/templates.pot b/xenial/debian/po/templates.pot
index b209fadd5..44c5cdcb5 100644
--- a/xenial/debian/po/templates.pot
+++ b/xenial/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2014-10-10 07:34+0000\n"
+"POT-Creation-Date: 2015-02-02 01:45+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"
@@ -355,6 +355,75 @@ msgstr ""
 msgid "Please enter the local IP address for this hypervisor."
 msgstr ""
 
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Nova server URL:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:15001
+msgid "Please enter the URL of the Nova server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+msgid "Nova server region name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:16001
+msgid "Please enter the region of the Nova server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Nova admin tenant ID:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid ""
+"Neutron needs to be able to communicate with Nova through Keystone. "
+"Therefore Neutron needs to know the Nova admin tenant ID, username and "
+"password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:17001
+msgid "Please enter the ID of the admin tenant for Nova."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+msgid "Neutron administrator username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-common.templates:18001
+msgid "Please enter the username of the Nova administrator."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Nova administrator password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-common.templates:19001
+msgid "Please enter the password of the Nova administrator."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
@@ -488,3 +557,27 @@ msgid ""
 "representing a location. Please enter the zone that the metadata server "
 "should use."
 msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid "Metadata proxy shared secret:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"VM instances using Neutron to handle networking retrieve their metadata "
+"through the Neutron metadata agent, which serves as a proxy to the Nova "
+"metadata REST API server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-metadata-agent.templates:7001
+msgid ""
+"Please enter the password that should be used to protect communications "
+"between the Neutron metadata proxy agent and the Nova metadata server. The "
+"same shared password should be used when setting up the nova-common package."
+msgstr ""