Do not use Keystone admin auth token to register API endpoints.

Rewritten-From: 6e8468bc719995e5b92d12703c46afd240544d39

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index e04cfaee30e5dc9b56963b8fa1de4aad2602009a..c709384c6ef847531a42795ea4548ba6ff2b24a1 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2:8.0.0~rc1-2) experimental; urgency=medium
+
+  * Do not use Keystone admin auth token to register API endpoints.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 29 Mar 2016 13:50:43 +0000
+
 neutron (2:8.0.0~rc1-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/control b/trusty/debian/control
index 3df81d1bd15aa224d5a78595a72cc89fa02c042e..97bc9c48cea16ee4e872e5ea6fb583cb88a6337d 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -8,7 +8,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               openstack-pkg-tools (>= 38~),
+               openstack-pkg-tools (>= 40~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),

diff --git a/trusty/debian/neutron-server.templates b/trusty/debian/neutron-server.templates
index 5d4e59234abc12dab091cf78b533d0f2c6788fd8..17408264ee739de201243204be31ae03784043e1 100644 (file)
--- a/trusty/debian/neutron-server.templates
+++ b/trusty/debian/neutron-server.templates
@@ -16,7 +16,8 @@ _Description: Register Neutron in the Keystone endpoint catalog?
  endpoint-create". This can be done automatically now.
  .
  Note that you will need to have an up and running Keystone server on which to
- connect using the Keystone authentication token.
+ connect using a known admin project name, admin username and password. The
+ admin auth token is not used anymore.
 
 Template: neutron/keystone-ip
 Type: string
@@ -24,11 +25,25 @@ _Description: Keystone server IP address:
  Please enter the IP address of the Keystone server, so that neutron-api can
  contact Keystone to do the Neutron service and endpoint creation.
 
-Template: neutron/keystone-auth-token
+Template: neutron/keystone-admin-name
+Type: string
+Default: admin
+_Description: Keystone admin name:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
+
+Template: neutron/keystone-project-name
+Type: string
+Default: admin
+_Description: Keystone admin project name:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
+
+Template: neutron/keystone-admin-password
 Type: password
-_Description: Keystone authentication token:
- To configure its endpoint in Keystone, neutron-server needs the Keystone auth
- token.
+_Description: Keystone admin password:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
 
 Template: neutron/endpoint-ip
 Type: string

diff --git a/trusty/debian/po/da.po b/trusty/debian/po/da.po
index d5eb3f5d3cddd25e159030a2701d2e77d53385d8..0fc34b73ce53aaf70c69c991737e596a2216898c 100644 (file)
--- a/trusty/debian/po/da.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\n"
 "PO-Revision-Date: 2015-05-31 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -488,9 +488,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Bemærk at du skal have en fungerende Keystone-server at forbinde til via "
 "Keystones godkendelsessymbol."
@@ -511,37 +516,58 @@ msgstr ""
 "Angiv IP-adressen for din Keystone-server, så at neutron-api kan kontakte "
 "Keystone for at udføre Neutron-tjenesten og slutpunktsoprettelse."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Symbol for Keystone-godkendelse:"
+#, fuzzy
+#| msgid "Neutron administrator username:"
+msgid "Keystone admin name:"
+msgstr "Neutron-administratorbrugernavn:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"For at konfigurere slutpunktet i Keystone, skal neutron-server bruge "
-"Keystones godkendelsessymbol."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Nova admin tenant ID:"
+msgid "Keystone admin project name:"
+msgstr "Tenant-id for Novaadministratoren:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+#, fuzzy
+#| msgid "Nova administrator password:"
+msgid "Keystone admin password:"
+msgstr "Adgangskode for Novaadministratoren:"
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "IP-adresse for Neutron-slutpunkt:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr "Angiv IP-adressen som skal bruges til at kontakte Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -553,13 +579,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Regionsnavn at registrere:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -649,3 +675,13 @@ msgstr ""
 "Indtast venligst adgangskoden som skal bruges til at beskytte kommunikation "
 "mellem Neutron metadata proxy-agenten og Nova metadata-serveren. Den samme "
 "delte adgangskode skal bruges når pakken nova-common sættes op."
+
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Symbol for Keystone-godkendelse:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "For at konfigurere slutpunktet i Keystone, skal neutron-server bruge "
+#~ "Keystones godkendelsessymbol."

diff --git a/trusty/debian/po/de.po b/trusty/debian/po/de.po
index 97605da5853a50cf46ce3ea2b20f3c66485867cd..d119be64557a931be6d9d30bf53737ac47e626b3 100644 (file)
--- a/trusty/debian/po/de.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\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"
@@ -505,9 +505,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Beachten Sie, dass Sie einen gestarteten und laufenden Keystone-Server haben "
 "müssen, mit dem Sie sich anhand des Keystone-Authentifizierungs-Tokens "
@@ -530,31 +535,50 @@ msgstr ""
 "Keystone kontaktieren kann, um den Neutron-Dienst und den Endpunkt zu "
 "erstellen."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Authentifizierungs-Token des Keystone-Servers:"
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin name:"
+msgstr "Benutzername des Authentifizierungsservers:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Neutron-Server benötigt das Keystone-Authentifizierungs-Token, um seinen "
-"Endpunkt in Keystone zu konfigurieren."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin project name:"
+msgstr "Benutzername des Authentifizierungsservers:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "IP-Adresse des Neutron-Endpunkts:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 "Bitte geben Sie die IP-Adresse ein, die zum Kontaktieren von Neutron benutzt "
@@ -562,7 +586,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -574,13 +598,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Name der Region, die registriert wird:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -667,5 +691,15 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Authentifizierungs-Token des Keystone-Servers:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Neutron-Server benötigt das Keystone-Authentifizierungs-Token, um seinen "
+#~ "Endpunkt in Keystone zu konfigurieren."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/es.po b/trusty/debian/po/es.po
index e1cebacabbdc16b41749e6be8ef99ea8b32de0cf..ace722b1fa6f69bce55f10d99c8d2f6e20493563 100644 (file)
--- a/trusty/debian/po/es.po
+++ b/trusty/debian/po/es.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron 2015.06.24\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\n"
 "PO-Revision-Date: 2015-06-30 17:15+0200\n"
 "Last-Translator: Camaleón <noelamac@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -508,9 +508,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Tenga en cuenta que necesitará disponer de un servidor Keystone en ejecución "
 "al que conectarse utilizando el token de autenticación de Keystone."
@@ -532,38 +537,59 @@ msgstr ""
 "contactar con Keystone para realizar el servicio Neutron y crear el punto "
 "final."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Token de autenticación de Keystone:"
+#, fuzzy
+#| msgid "Neutron administrator username:"
+msgid "Keystone admin name:"
+msgstr "Nombre de usuario del administrador de Neutron:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Para configurar su punto final en Keystone, neutron-server necesita el token "
-"de autenticación de Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Nova admin tenant ID:"
+msgid "Keystone admin project name:"
+msgstr "ID del inquilino («tenant») administrador de Nova:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+#, fuzzy
+#| msgid "Nova administrator password:"
+msgid "Keystone admin password:"
+msgstr "Contraseña del administrador de Nova:"
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "Dirección IP del punto final de Neutron:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 "Introduzca la dirección IP que se utilizará para contactar con Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -575,13 +601,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nombre de la región a registrar:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -674,5 +700,15 @@ msgstr ""
 "de metadatos de Nova. Debe utilizar esta misma contraseña compartida cuando "
 "configure el paquete nova-common."
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Token de autenticación de Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Para configurar su punto final en Keystone, neutron-server necesita el "
+#~ "token de autenticación de Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/fr.po b/trusty/debian/po/fr.po
index 64db9040acb4c6f3d80c00d0cd306bd6a3b4ffda..e18c6e02efdcc4eb88aca6a1443fdd0418ef5ec0 100644 (file)
--- a/trusty/debian/po/fr.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\n"
 "PO-Revision-Date: 2015-05-06 11:59+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -497,9 +497,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Veuillez noter que vous aurez besoin d'avoir un serveur Keystone fonctionnel "
 "sur lequel se connecter pour utiliser le jeton d'authentification Keystone."
@@ -521,38 +526,59 @@ msgstr ""
 "Neutron puisse contacter Keystone pour établir le service Neutron et créer "
 "le point d'accès."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Jeton d'authentification Keystone :"
+#, fuzzy
+#| msgid "Neutron administrator username:"
+msgid "Keystone admin name:"
+msgstr "Identifiant de l'administrateur de Neutron :"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Pour configurer son point d'accès dans Keystone, le serveur Neutron a besoin "
-"du jeton d'authentification Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Nova admin tenant ID:"
+msgid "Keystone admin project name:"
+msgstr "Identifiant du client administrateur pour Nova :"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+#, fuzzy
+#| msgid "Nova administrator password:"
+msgid "Keystone admin password:"
+msgstr "Mot de passe administrateur pour Nova :"
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "Adresse IP du point d'accès Neutron :"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 "Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -564,13 +590,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nom de la région à enregistrer :"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -663,5 +689,15 @@ msgstr ""
 "de métadonnées de Nova. Le même mot de passe partagé doit être utilisé lors "
 "de l'installation du paquet nova-common."
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Jeton d'authentification Keystone :"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Pour configurer son point d'accès dans Keystone, le serveur Neutron a "
+#~ "besoin du jeton d'authentification Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/it.po b/trusty/debian/po/it.po
index 570c2350c8d980ebce24189e146e66eaf0c45c26..cb1e8d30c5375f73b4fd2206ab32336350c0171c 100644 (file)
--- a/trusty/debian/po/it.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\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"
@@ -493,9 +493,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Notare che sarà necessario avere un server Keystone in funzione a cui "
 "connettersi usando il token di autenticazione Keystone."
@@ -517,37 +522,56 @@ msgstr ""
 "contattare Keystone per effettuare la creazione del servizio e del punto "
 "terminale Neutron."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Token di autenticazione Keystone:"
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin name:"
+msgstr "Nome utente per il server di autenticazione:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Per configurare il proprio punto terminale in Keystone, neutron-server ha "
-"bisogno del token di autenticazione Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin project name:"
+msgstr "Nome utente per il server di autenticazione:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "Indirizzo IP del punto terminale Neutron:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr "Inserire l'indirizzo IP che verrà usato per contattare Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -559,13 +583,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nome della regione da registrare:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -651,5 +675,15 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Token di autenticazione Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Per configurare il proprio punto terminale in Keystone, neutron-server ha "
+#~ "bisogno del token di autenticazione Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/nl.po b/trusty/debian/po/nl.po
index 8ea719e2548a91fc4433bbd81573d40d7c47f511..02c0ea6470a78375a350404bf875761df9c0023c 100644 (file)
--- a/trusty/debian/po/nl.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\n"
 "PO-Revision-Date: 2015-08-29 21:25+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -500,9 +500,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Merk op dat u een functionerende Keystone-server moet hebben, waarmee u "
 "verbinding kunt maken met behulp van het legitimatiebewijs voor Keystone."
@@ -524,37 +529,58 @@ msgstr ""
 "Keystone kan contacteren om de Neutrondienst en het toegangspunt aan te "
 "maken."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Legitimatiebewijs voor Keystone:"
+#, fuzzy
+#| msgid "Neutron administrator username:"
+msgid "Keystone admin name:"
+msgstr "Gebruikersnaam van de beheerder van Neutron:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Om zijn toegangspunt in Keystone te kunnen aanmaken, heeft neutron-server "
-"het legitimatiebewijs voor Keystone nodig."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Nova admin tenant ID:"
+msgid "Keystone admin project name:"
+msgstr "ID van de clientruimte (tenant) van de beheerder van Nova:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+#, fuzzy
+#| msgid "Nova administrator password:"
+msgid "Keystone admin password:"
+msgstr "Wachtwoord van de Nova-beheerder:"
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "IP-adres van het toegangspunt van Neutron:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr "Geef op welk IP-adres gebruikt zal worden om Neutron te contacteren."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -566,13 +592,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Naam van de registratieregio:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -665,5 +691,15 @@ msgstr ""
 "Neutron en de server voor metagegevens van Nova. Hetzelfde gedeelde "
 "wachtwoord moet gebruikt worden bij het instellen van het pakket nova-common."
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Legitimatiebewijs voor Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Om zijn toegangspunt in Keystone te kunnen aanmaken, heeft neutron-server "
+#~ "het legitimatiebewijs voor Keystone nodig."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/pt.po b/trusty/debian/po/pt.po
index a1cdeaaf1cb1b3013fdb06bd205d815f76d5775b..28ea6fd6c9b124f73d987136a2e2e1fad200dcd0 100644 (file)
--- a/trusty/debian/po/pt.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\n"
 "PO-Revision-Date: 2015-05-07 00:22+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -495,9 +495,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Note que irá precisar de ter um servidor Keystone a funcionar no qual ligar "
 "usando o sinal de autenticação do Keystone."
@@ -519,38 +524,59 @@ msgstr ""
 "possa contactar o Keystone para fazer o serviço Neutron e a criação do "
 "\"endpoint\"."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Sinal de autenticação do Keystone:"
+#, fuzzy
+#| msgid "Neutron administrator username:"
+msgid "Keystone admin name:"
+msgstr "Nome de utilizador do administrador do Neutron:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Para configurar o seu endpoint no Keystone, o neutron-server precisa do "
-"sinal de autenticação do Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Nova admin tenant ID:"
+msgid "Keystone admin project name:"
+msgstr "ID do \"tenant admin\" do Nova:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+#, fuzzy
+#| msgid "Nova administrator password:"
+msgid "Keystone admin password:"
+msgstr "Palavra passe do administrador do Nova:"
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "Endereço IP endpoint do Neutron:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 "Por favor indique o endereço IP que será usado para contactar o Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -562,13 +588,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nome da região a registar:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -662,5 +688,15 @@ msgstr ""
 "meta-dados do Nova. A mesma palavra passe partilhada deve ser usada quando "
 "configurar o pacote nova-common."
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Sinal de autenticação do Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Para configurar o seu endpoint no Keystone, o neutron-server precisa do "
+#~ "sinal de autenticação do Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/pt_BR.po b/trusty/debian/po/pt_BR.po
index 5ba68a07ce7b91fb91c5d853d474a2674cfb7c23..4bdc54d95612235a0e80609230e3063ff6365032 100644 (file)
--- a/trusty/debian/po/pt_BR.po
+++ b/trusty/debian/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\n"
 "PO-Revision-Date: 2016-01-10 15:25-0200\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -497,9 +497,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Note que você precisará ter um servidor Keystone configurado e em execução "
 "no qual conectar usando o \"token\" de autenticação do Keystone."
@@ -521,38 +526,59 @@ msgstr ""
 "neutron-api possa contatar o Keystone para efetuar a criação do \"endpoint\" "
 "e do serviço Neutron."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "\"Token\" de autenticação Keystone:"
+#, fuzzy
+#| msgid "Neutron administrator username:"
+msgid "Keystone admin name:"
+msgstr "Nome de usuário do administrador do Neutron:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Para configurar o seu \"endpoint\" no Keystone, o neutron-server precisa do "
-"\"token\" de autenticação do Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Nova admin tenant ID:"
+msgid "Keystone admin project name:"
+msgstr "ID de locatário (\"tenant\") do administrador do Nova:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+#, fuzzy
+#| msgid "Nova administrator password:"
+msgid "Keystone admin password:"
+msgstr "Senha do administrador do Nova:"
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "Endereço IP do \"endpoint\" Neutron:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 "Por favor, informe o endereço IP que será usado para contatar o Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -564,13 +590,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Nome da região para registrar:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -663,3 +689,13 @@ msgstr ""
 "entre o agente de proxy de metadados do Neutron e o servidor de metadados do "
 "Nova. A mesma senha compartilhada deverá ser usada ao configurar o pacote "
 "nova-common."
+
+#~ msgid "Keystone authentication token:"
+#~ msgstr "\"Token\" de autenticação Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Para configurar o seu \"endpoint\" no Keystone, o neutron-server precisa "
+#~ "do \"token\" de autenticação do Keystone."

diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po
index 24fb1367374cd227a0aa2e421ae0846e914034aa..615807f4985c7e2fea81ea61bfbcbe22e21e22d8 100644 (file)
--- a/trusty/debian/po/ru.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\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"
@@ -487,9 +487,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 "Заметим, что у вас должен быть работающий сервер Keystone, к которому будет "
 "произведено подключение с помощью токена аутентификации Keystone."
@@ -510,37 +515,56 @@ msgstr ""
 "Введите IP-адрес сервера Keystone для того, чтобы neutron-api могла "
 "подключиться к Keystone для запуска службы Neutron и создания конечной точки."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Токен аутентификации Keystone:"
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin name:"
+msgstr "Имя пользователя сервера аутентификации:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"Для настройки собственной конечной точки в Keystone neutron-api требуется "
-"токен аутентификации Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin project name:"
+msgstr "Имя пользователя сервера аутентификации:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "IP-адрес конечной точки Neutron:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr "Введите IP-адрес, который будет использован для подключения к Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -552,13 +576,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Название области для регистрации:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -644,5 +668,15 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Токен аутентификации Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "Для настройки собственной конечной точки в Keystone neutron-api требуется "
+#~ "токен аутентификации Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/sv.po b/trusty/debian/po/sv.po
index 7d37d834b88005cd0120de250c19c4b730213ab2..fdce53a936140cabb0159ce1c963e85363cb6a39 100644 (file)
--- a/trusty/debian/po/sv.po
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\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"
@@ -495,9 +495,14 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Note that you will need to have an up and running Keystone server on "
+#| "which to connect using the Keystone authentication token."
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr "OBS. Du behöver ha en fungerande keystone-server att ansluta till."
 
 #. Type: string
@@ -516,37 +521,56 @@ msgstr ""
 "Ange IP-adressen till din keystone-server så att neutron-api kan kontakta "
 "Keystone för att lägga till Neutron-tjänsten som en ändpunkt."
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
-msgstr "Autetiseringsvärde för Keystone:"
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin name:"
+msgstr "Användarnamn på identifieringsservern:"
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
-"För att lägga till ändpunkt i Keystone behöver neutron-server ett "
-"autentiseringsvärde för Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+#, fuzzy
+#| msgid "Auth server username:"
+msgid "Keystone admin project name:"
+msgstr "Användarnamn på identifieringsservern:"
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr "IP-adress för Neutron-ändpunkt:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr "Ange den IP-adress som ska användas för att kontakta Neutron."
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -558,13 +582,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr "Regionnamn:"
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "
@@ -648,5 +672,15 @@ msgid ""
 "same shared password should be used when setting up the nova-common package."
 msgstr ""
 
+#~ msgid "Keystone authentication token:"
+#~ msgstr "Autetiseringsvärde för Keystone:"
+
+#~ msgid ""
+#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
+#~ "auth token."
+#~ msgstr ""
+#~ "För att lägga till ändpunkt i Keystone behöver neutron-server ett "
+#~ "autentiseringsvärde för Keystone."
+
 #~ msgid "ml2/ml2_conf.ini"
 #~ msgstr "ml2/ml2_conf.ini"

diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot
index b3a14dd6fb5e35ac833351c3e9adef3f96b542cf..6a07d129cbf264ac5da0d42969cf96cc07405af7 100644 (file)
--- a/trusty/debian/po/templates.pot
+++ b/trusty/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: 2016-03-22 09:52+0000\n"
+"POT-Creation-Date: 2016-03-29 13:50+0000\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"
@@ -444,7 +444,8 @@ msgstr ""
 #: ../neutron-server.templates:2001
 msgid ""
 "Note that you will need to have an up and running Keystone server on which "
-"to connect using the Keystone authentication token."
+"to connect using a known admin project name, admin username and password. "
+"The admin auth token is not used anymore."
 msgstr ""
 
 #. Type: string
@@ -461,35 +462,52 @@ msgid ""
 "contact Keystone to do the Neutron service and endpoint creation."
 msgstr ""
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-msgid "Keystone authentication token:"
+msgid "Keystone admin name:"
 msgstr ""
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
 #. Type: password
 #. Description
-#: ../neutron-server.templates:4001
+#: ../neutron-server.templates:4001 ../neutron-server.templates:5001
+#: ../neutron-server.templates:6001
 msgid ""
-"To configure its endpoint in Keystone, neutron-server needs the Keystone "
-"auth token."
+"To register the service endpoint, this package needs to know the Admin "
+"login, name, project name, and password to the Keystone server."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
+msgid "Keystone admin project name:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../neutron-server.templates:6001
+msgid "Keystone admin password:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../neutron-server.templates:7001
 msgid "Neutron endpoint IP address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid "Please enter the IP address that will be used to contact Neutron."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:5001
+#: ../neutron-server.templates:7001
 msgid ""
 "This IP address should be accessible from the clients that will use this "
 "service, so if you are installing a public cloud, this should be a public IP "
@@ -498,13 +516,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid "Name of the region to register:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../neutron-server.templates:6001
+#: ../neutron-server.templates:8001
 msgid ""
 "OpenStack supports using availability zones, with each region representing a "
 "location. Please enter the zone that you wish to use when registering the "