From: Thomas Goirand Date: Tue, 29 Mar 2016 13:51:08 +0000 (+0000) Subject: Do not use Keystone admin auth token to register API endpoints. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b93103a6ad94e6eaa9f5b4dc004b950d9da70a2a;p=openstack-build%2Fneutron-build.git 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 e04cfaee3..c709384c6 100644 --- 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 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 3df81d1bd..97bc9c48c 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -8,7 +8,7 @@ Uploaders: Thomas Goirand , 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 5d4e59234..17408264e 100644 --- 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 d5eb3f5d3..0fc34b73c 100644 --- 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 \n" "Language-Team: Danish \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 97605da58..d119be645 100644 --- 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 \n" "Language-Team: German \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 e1cebacab..ace722b1f 100644 --- 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 \n" "Language-Team: Debian Spanish \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 64db9040a..e18c6e02e 100644 --- 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 \n" "Language-Team: FRENCH \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 570c2350c..cb1e8d30c 100644 --- 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 \n" "Language-Team: Italian \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 8ea719e25..02c0ea647 100644 --- 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 \n" "Language-Team: Debian Dutch l10n Team \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 a1cdeaaf1..28ea6fd6c 100644 --- 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 \n" "Language-Team: Portuguese \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 5ba68a07c..4bdc54d95 100644 --- 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 \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Russian \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 7d37d834b..fdce53a93 100644 --- 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 \n" "Language-Team: Swedish \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 b3a14dd6f..6a07d129c 100644 --- 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 \n" "Language-Team: LANGUAGE \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 "