From 2c9341a103d67f180aeb1c0e1f2b3f094e4a4696 Mon Sep 17 00:00:00 2001 From: Jerzy Mikolajczak Date: Fri, 8 Apr 2016 10:36:14 +0200 Subject: [PATCH] Update to 8.0.0 DEB: - Source [0] - Add missing dependencies (radvd, python-openvswitch, python-pyroute2) Commits 918a100 a5a14ee - Update references to Nicira NVP plugin (e839df9) - Add doc package and git as a build dependency RPM: - Source [1] - Add doc package [0] http://anonscm.debian.org/git/openstack/neutron.git/tree/debian?h=debian/mitaka [1] https://github.com/openstack-packages/neutron Change-Id: I276c83eebc5ac37e7489ca89064524df4213889c --- .../rpm/SOURCES/neutron-netns-cleanup.init | 1 + .../SOURCES/neutron-openvswitch-agent.service | 2 +- centos7/rpm/SOURCES/neutron-ovs-cleanup.init | 2 +- centos7/rpm/SPECS/openstack-neutron.spec | 222 +++++++++--------- trusty/debian/changelog | 42 +++- trusty/debian/control | 13 +- trusty/debian/copyright | 3 + trusty/debian/neutron-server.templates | 25 +- trusty/debian/po/da.po | 84 +++++-- trusty/debian/po/de.po | 70 ++++-- trusty/debian/po/es.po | 81 +++++-- trusty/debian/po/fr.po | 86 +++++-- trusty/debian/po/it.po | 70 ++++-- trusty/debian/po/nl.po | 81 +++++-- trusty/debian/po/pt.po | 99 +++++--- trusty/debian/po/pt_BR.po | 75 ++++-- trusty/debian/po/ru.po | 70 ++++-- trusty/debian/po/sv.po | 70 ++++-- trusty/debian/po/templates.pot | 46 ++-- trusty/debian/rules | 2 +- 20 files changed, 802 insertions(+), 342 deletions(-) diff --git a/centos7/rpm/SOURCES/neutron-netns-cleanup.init b/centos7/rpm/SOURCES/neutron-netns-cleanup.init index 1a77b01cd..e2aac5c8b 100644 --- a/centos7/rpm/SOURCES/neutron-netns-cleanup.init +++ b/centos7/rpm/SOURCES/neutron-netns-cleanup.init @@ -42,6 +42,7 @@ clean() { killall neutron-keepalived-state-change 2>/dev/null || : kill $(ps ax | grep -e "keepalived.*\.pid-vrrp" | awk '{print $1}') 2>/dev/null || : kill $(ps ax | grep -e "radvd.*\.pid\.radvd" | awk '{print $1}') 2>/dev/null || : + kill $(ps ax | grep -e "haproxy .*/conf .*/pid" | awk '{print $1}') 2>/dev/null || : fi return $? } diff --git a/centos7/rpm/SOURCES/neutron-openvswitch-agent.service b/centos7/rpm/SOURCES/neutron-openvswitch-agent.service index a3effe266..7477e2509 100644 --- a/centos7/rpm/SOURCES/neutron-openvswitch-agent.service +++ b/centos7/rpm/SOURCES/neutron-openvswitch-agent.service @@ -1,6 +1,6 @@ [Unit] Description=OpenStack Neutron Open vSwitch Agent -After=syslog.target network.target +After=syslog.target network.target network.service PartOf=network.service [Service] diff --git a/centos7/rpm/SOURCES/neutron-ovs-cleanup.init b/centos7/rpm/SOURCES/neutron-ovs-cleanup.init index 654fc4d59..2cea92570 100644 --- a/centos7/rpm/SOURCES/neutron-ovs-cleanup.init +++ b/centos7/rpm/SOURCES/neutron-ovs-cleanup.init @@ -23,7 +23,7 @@ exec="/usr/bin/$prog" pidfile="/var/run/$proj/$prog.pid" configs=( "/etc/$proj/$proj.conf" \ - "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \ + "/etc/$proj/plugins/ml2/openvswitch_agent.ini" \ ) configs_str=${configs[@]/#/--config-file } diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index d77bb9ab3..5c5421c75 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -1,37 +1,37 @@ %global service neutron -Name: openstack-%{service} -Version: 8.0.0.0b3 -Release: 1%{?dist} -Epoch: 1 -Summary: OpenStack Networking Service - -License: ASL 2.0 -URL: http://launchpad.net/%{service}/ - -Source0: %{service}-%{version}.tar.gz -Source1: %{service}.logrotate -Source2: %{service}-sudoers -Source10: neutron-server.service -Source11: neutron-linuxbridge-agent.service -Source12: neutron-openvswitch-agent.service -Source13: neutron-bgp-dragent.service -Source15: neutron-dhcp-agent.service -Source16: neutron-l3-agent.service -Source17: neutron-metadata-agent.service -Source18: neutron-ovs-cleanup.service -Source19: neutron-macvtap-agent.service -Source20: neutron-metering-agent.service -Source21: neutron-sriov-nic-agent.service -Source22: neutron-netns-cleanup.service -Source23: neutron-netns-cleanup.init -Source24: neutron-ovs-cleanup.init -Source29: neutron-rpc-server.service - -Source31: conf.README -Source32: neutron-linuxbridge-cleanup.service - -BuildArch: noarch +Name: openstack-%{service} +Version: 8.0.0 +Release: 1%{?dist} +Epoch: 1 +Summary: OpenStack Networking Service + +License: ASL 2.0 +URL: http://launchpad.net/%{service}/ + +Source0: %{service}-%{version}.tar.gz +Source1: %{service}.logrotate +Source2: %{service}-sudoers +Source10: neutron-server.service +Source11: neutron-linuxbridge-agent.service +Source12: neutron-openvswitch-agent.service +Source13: neutron-bgp-dragent.service +Source15: neutron-dhcp-agent.service +Source16: neutron-l3-agent.service +Source17: neutron-metadata-agent.service +Source18: neutron-ovs-cleanup.service +Source19: neutron-macvtap-agent.service +Source20: neutron-metering-agent.service +Source21: neutron-sriov-nic-agent.service +Source22: neutron-netns-cleanup.service +Source23: neutron-netns-cleanup.init +Source24: neutron-ovs-cleanup.init +Source29: neutron-rpc-server.service + +Source31: conf.README +Source32: neutron-linuxbridge-cleanup.service + +BuildArch: noarch BuildRequires: git BuildRequires: python-backports-ssl_match_hostname @@ -54,33 +54,33 @@ BuildRequires: python-pecan BuildRequires: python-setuptools BuildRequires: systemd-units -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} # dnsmasq is not a hard requirement, but is currently the only option # when neutron-dhcp-agent is deployed. -Requires: dnsmasq -Requires: dnsmasq-utils +Requires: dnsmasq +Requires: dnsmasq-utils # radvd is not a hard requirement, but is currently the only option # for IPv6 deployments. -Requires: radvd +Requires: radvd # dibbler is not a hard requirement, but is currently the default option # for IPv6 prefix delegation. -#Requires: dibbler-client +#Requires: dibbler-client # conntrack is not a hard requirement, but is currently used by L3 agent # to immediately drop connections after a floating IP is disassociated -Requires: conntrack-tools +Requires: conntrack-tools # keepalived is not a hard requirement, but is currently used by DVR L3 # agent -Requires: keepalived +Requires: keepalived # those are not hard requirements, but are used to implement firewall # drivers. -Requires: ipset -Requires: iptables +Requires: ipset +Requires: iptables Requires(pre): shadow-utils Requires(post): systemd @@ -100,51 +100,51 @@ capabilities (e.g., QoS, ACLs, network monitoring, etc.) %package -n python-%{service} -Summary: Neutron Python libraries -Requires: python-alembic >= 0.8.0 -Requires: python-debtcollector >= 1.2.0 -Requires: python-eventlet >= 0.18.2 -Requires: python-greenlet >= 0.3.2 -Requires: python-httplib2 >= 0.7.5 -Requires: python-jinja2 >= 2.8 -Requires: python-keystoneauth1 >= 2.1.0 -Requires: python-keystoneclient >= 1.6.0 -Requires: python-keystonemiddleware >= 4.0.0 -Requires: python-netaddr >= 0.7.12 -Requires: python-neutronclient >= 2.6.0 -Requires: python-neutron-lib -Requires: python-novaclient >= 2.29.0 -Requires: python-openvswitch -Requires: python-oslo-concurrency >= 3.5.0 -Requires: python-oslo-config >= 2:3.7.0 -Requires: python-oslo-context >= 0.2.0 -Requires: python-oslo-db >= 4.1.0 -Requires: python-oslo-i18n >= 2.1.0 -Requires: python-oslo-log >= 1.14.0 -Requires: python-oslo-messaging >= 4.0.0 -Requires: python-oslo-middleware >= 3.0.0 -Requires: python-oslo-policy >= 0.5.0 -Requires: python-oslo-reports >= 0.6.0 -Requires: python-oslo-rootwrap >= 2.0.0 -Requires: python-oslo-serialization >= 1.10.0 -Requires: python-oslo-service >= 1.0.0 -Requires: python-oslo-utils >= 3.5.0 -Requires: python-oslo-versionedobjects >= 1.5.0 -Requires: python-oslo-context >= 0.2.0 -Requires: python-paste -Requires: python-paste-deploy >= 1.5.0 -Requires: python-pecan >= 1.0.0 -Requires: python-pbr -Requires: python-pyroute2 -Requires: python-requests >= 2.8.1 -Requires: python-retrying >= 1.2.3 -Requires: python-routes >= 1.12.3 -Requires: python-ryu >= 3.30 -Requires: python-six >= 1.9.0 -Requires: python-sqlalchemy >= 1.0.10 -Requires: python-stevedore >= 1.5.0 -Requires: python-webob >= 1.2.3 -Requires: python-unicodecsv +Summary: Neutron Python libraries +Requires: python-alembic >= 0.8.0 +Requires: python-debtcollector >= 1.2.0 +Requires: python-eventlet >= 0.18.2 +Requires: python-greenlet >= 0.3.2 +Requires: python-httplib2 >= 0.7.5 +Requires: python-jinja2 >= 2.8 +Requires: python-keystoneauth1 >= 2.1.0 +Requires: python-keystoneclient >= 1.6.0 +Requires: python-keystonemiddleware >= 4.0.0 +Requires: python-netaddr >= 0.7.12 +Requires: python-neutronclient >= 2.6.0 +Requires: python-neutron-lib +Requires: python-novaclient >= 2.29.0 +Requires: python-openvswitch +Requires: python-oslo-concurrency >= 3.5.0 +Requires: python-oslo-config >= 2:3.7.0 +Requires: python-oslo-context >= 0.2.0 +Requires: python-oslo-db >= 4.1.0 +Requires: python-oslo-i18n >= 2.1.0 +Requires: python-oslo-log >= 1.14.0 +Requires: python-oslo-messaging >= 4.0.0 +Requires: python-oslo-middleware >= 3.0.0 +Requires: python-oslo-policy >= 0.5.0 +Requires: python-oslo-reports >= 0.6.0 +Requires: python-oslo-rootwrap >= 2.0.0 +Requires: python-oslo-serialization >= 1.10.0 +Requires: python-oslo-service >= 1.0.0 +Requires: python-oslo-utils >= 3.5.0 +Requires: python-oslo-versionedobjects >= 1.5.0 +Requires: python-oslo-context >= 0.2.0 +Requires: python-paste +Requires: python-paste-deploy >= 1.5.0 +Requires: python-pecan >= 1.0.0 +Requires: python-pbr +Requires: python-pyroute2 +Requires: python-requests >= 2.8.1 +Requires: python-retrying >= 1.2.3 +Requires: python-routes >= 1.12.3 +Requires: python-ryu >= 3.30 +Requires: python-six >= 1.9.0 +Requires: python-sqlalchemy >= 1.0.10 +Requires: python-stevedore >= 1.5.0 +Requires: python-unicodecsv +Requires: python-webob >= 1.2.3 @@ -156,8 +156,8 @@ This package contains the Neutron Python library. %package -n python-%{service}-tests -Summary: Neutron tests -Requires: openstack-%{service} = %{epoch}:%{version}-%{release} +Summary: Neutron tests +Requires: python-%{service} = %{epoch}:%{version}-%{release} %description -n python-%{service}-tests @@ -168,9 +168,9 @@ This package contains Neutron test files. %package common -Summary: Neutron common files -Requires: python-%{service} = %{epoch}:%{version}-%{release} -Requires: sudo +Summary: Neutron common files +Requires: python-%{service} = %{epoch}:%{version}-%{release} +Requires: sudo %description common @@ -195,18 +195,18 @@ Neutron. %package linuxbridge -Summary: Neutron linuxbridge plugin -Requires: bridge-utils -Requires: ebtables -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Summary: Neutron Linuxbridge agent +Requires: bridge-utils +Requires: ebtables +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} %description linuxbridge Neutron provides an API to dynamically request and configure virtual networks. -This package contains the Neutron plugin that implements virtual -networks as VLANs using Linux bridging. +This package contains the Neutron agent that implements virtual +networks using VLAN or VXLAN using Linuxbridge technology. %package macvtap-agent @@ -223,10 +223,10 @@ macvtap attachments for libvirt qemu/kvm instances. %package ml2 -Summary: Neutron ML2 plugin -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Summary: Neutron ML2 plugin +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} # needed for brocade and cisco drivers -Requires: python-ncclient +Requires: python-ncclient %description ml2 @@ -239,13 +239,13 @@ for accessing those types. %package openvswitch -Summary: Neutron openvswitch plugin -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Summary: Neutron openvswitch plugin +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} # We require openvswitch when using vsctl to access ovsdb; # but if we use native access, then we just need python bindings. # since we don't know what users actually use, we depend on both. -Requires: openvswitch -Requires: python-openvswitch +Requires: openvswitch +Requires: python-openvswitch %description openvswitch @@ -257,8 +257,8 @@ networks using Open vSwitch. %package metering-agent -Summary: Neutron bandwidth metering agent -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Summary: Neutron bandwidth metering agent +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} %description metering-agent @@ -269,8 +269,8 @@ utilization notifications. %package rpc-server -Summary: Neutron (RPC only) Server -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Summary: Neutron (RPC only) Server +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} %description rpc-server @@ -282,8 +282,8 @@ workload only. %package sriov-nic-agent -Summary: Neutron SR-IOV NIC agent -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} +Summary: Neutron SR-IOV NIC agent +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} %description sriov-nic-agent @@ -738,6 +738,8 @@ fi %changelog +* Fri Apr 8 2016 Jerzy Mikolajczak 1:8.0.0-1%{?dist}~mos1 +- Update specs for Mitaka Final release * Sun Mar 6 2016 Sergey Kolekonov 1:8.0.0.0b3-1.el7 - Rebuild for Mitaka-b3 * Thu Feb 25 2016 Jerzy Mikolajczak 1:8.0.0.0b2-1%{?dist}~mos2 diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 1aa9653cd..20f9667a7 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,39 @@ +neutron (2:8.0.0-1~u14.04+mos1) mos9.0; urgency=medium + + * Source [0] + [0] http://anonscm.debian.org/git/openstack/neutron.git/tree/debian?h=debian/mitaka + + -- Jerzy Mikolajczak Fri, 08 Apr 2016 11:10:40 +0200 + +neutron (2:8.0.0~rc3-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Fixed (build-)depends for this release. + * Added missing copyright holders (Closes: #816208). + * Failed tests fails the build. + + -- Thomas Goirand Tue, 05 Apr 2016 10:07:40 +0200 + +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. + * Fixed ryu version to 3.30, since I could upload it to Experimental after + current maintainer agreed with team maintenance. + * Added missing runtime depends: q-text-as-data. + * Rebuild with newer oslo.config. + * Added Return_oslo_config_Opts_to_config_generator.patch to avoid warnings. + * Standards-Version: 3.9.7 (no change). + * Ran debconf-updatepo. + + -- Thomas Goirand Mon, 21 Mar 2016 14:46:45 +0100 + neutron (2:8.0.0~b3-1~u14.04+mos1) mos9.0; urgency=medium * Source [0] @@ -391,7 +427,7 @@ neutron (2014.1~rc1-2) experimental; urgency=low neutron (2014.1~rc1-1) experimental; urgency=medium [ gustavo panizzo ] - * Fixes an issue using ml2 and openvswitch plugin, openvswitch agent wasn't + * Fixes an issue using ml2 and openvswitch plugin, openvswitch agent wasn't loading it's config file. [ Thomas Goirand ] @@ -501,8 +537,8 @@ neutron (2013.2-7) unstable; urgency=low * Removes openvswitch-switch from depends since it's in pre-depends. [ gustavo panizzo ] - * Watch file fixed. - * Dependency on OpenvSwitch has been updated to 1.9, as it required by + * Watch file fixed. + * Dependency on OpenvSwitch has been updated to 1.9, as it required by the plugin. -- Thomas Goirand Mon, 02 Dec 2013 22:39:46 +0800 diff --git a/trusty/debian/control b/trusty/debian/control index 4ba653efb..b7d692eb1 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), dh-python, dh-systemd, git, - openstack-pkg-tools (>= 38~), + openstack-pkg-tools (>= 40~), po-debconf, python-all, python-pbr (>= 1.8), @@ -33,7 +33,8 @@ Build-Depends-Indep: alembic (>= 0.8.0), python-keystonemiddleware (>= 4.0.0), python-mock (>= 1.3), python-netaddr (>= 0.7.12), - python-neutronclient (>= 1:2.6.0), + python-netifaces (>= 0.10.4), + python-neutronclient (>= 1:4.1.0), python-neutron-lib, python-novaclient (>= 2:2.30.1), python-openvswitch, @@ -76,7 +77,7 @@ Build-Depends-Indep: alembic (>= 0.8.0), python-webtest, subunit, testrepository, -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://neutron.openstack.org/ Vcs-Browser: https://anonscm.debian.org/cgit/openstack/neutron.git/ Vcs-Git: https://anonscm.debian.org/git/openstack/neutron.git @@ -99,7 +100,8 @@ Depends: alembic (>= 0.8.0), python-keystonemiddleware (>= 4.0.0), python-mysqldb, python-netaddr (>= 0.7.12), - python-neutronclient (>= 1:2.6.0), + python-netifaces (>= 0.10.4), + python-neutronclient (>= 1:4.1.0), python-neutron-lib, python-novaclient (>= 2:2.30.1), python-openvswitch, @@ -157,6 +159,7 @@ Depends: adduser, lsb-base, neutron-common (= ${source:Version}), python-openstackclient, + q-text-as-data, ${misc:Depends}, ${python:Depends}, Description: OpenStack virtual network service - server @@ -176,7 +179,7 @@ Depends: adduser, python-mysqldb, python-neutron (= ${source:Version}), python-pyparsing (>=1.5.7), - python-sqlalchemy, + python-sqlalchemy (>= 1.0.10), sqlite3, ${misc:Depends}, ${python:Depends}, diff --git a/trusty/debian/copyright b/trusty/debian/copyright index faf7b38c1..67c6ad4b1 100644 --- a/trusty/debian/copyright +++ b/trusty/debian/copyright @@ -32,6 +32,9 @@ Copyright: (c) 2011-2016, OpenStack Foundation \n" "Language-Team: Danish \n" @@ -415,20 +415,27 @@ msgstr "Angiv venligst regionen for Novaserveren." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" +#, fuzzy +#| msgid "Nova admin tenant ID:" +msgid "Nova admin tenant name:" msgstr "Tenant-id for Novaadministratoren:" #. Type: string #. Description #: ../neutron-common.templates:17001 +#, fuzzy +#| msgid "" +#| "Neutron needs to be able to communicate with Nova through Keystone. " +#| "Therefore Neutron needs to know the Nova admin tenant ID, username and " +#| "password." msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" -"Neutron skal være i stand til at kommunikere med Nova via Keystone. " -"Derfor skal Neutron kende til tenant-Id'et for Novaadministratoren, " -"brugernavn og adgangskode." +"Neutron skal være i stand til at kommunikere med Nova via Keystone. Derfor " +"skal Neutron kende til tenant-Id'et for Novaadministratoren, brugernavn og " +"adgangskode." #. Type: string #. Description @@ -481,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." @@ -504,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 " @@ -546,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 " @@ -628,8 +661,8 @@ msgid "" "metadata REST API server." msgstr "" "VM-instanser, der bruger Neutron til at håndtere netværk, henter deres " -"metadata via Neutrons metadataagent, som fungerer som en proxy til " -"Nova metadata REST API-serveren." +"metadata via Neutrons metadataagent, som fungerer som en proxy til Nova " +"metadata REST API-serveren." #. Type: password #. Description @@ -643,3 +676,12 @@ msgstr "" "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 71805b877..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: 2015-02-02 01:45+0100\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" @@ -430,15 +430,17 @@ msgstr "Bitte geben Sie die IP-Adresse dieses Servers an." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" -msgstr "" +#, fuzzy +#| msgid "Auth server username:" +msgid "Nova admin tenant name:" +msgstr "Benutzername des Authentifizierungsservers:" #. Type: string #. Description #: ../neutron-common.templates:17001 msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" @@ -503,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 " @@ -528,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 " @@ -560,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 " @@ -572,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 " @@ -665,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 ffd2d3b0b..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: 2015-02-02 01:45+0100\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" @@ -417,36 +417,40 @@ msgstr "URL del servidor Nova:" #. Type: string #. Description #: ../neutron-common.templates:15001 -#| msgid "Please specify the IP address of that server." msgid "Please enter the URL of the Nova server." msgstr "Introduzca la URL del servidor Nova." #. Type: string #. Description #: ../neutron-common.templates:16001 -#| msgid "Auth server tenant name:" msgid "Nova server region name:" msgstr "Nombre de la región del servidor Nova:" #. Type: string #. Description #: ../neutron-common.templates:16001 -#| msgid "Please specify the IP address of that server." msgid "Please enter the region of the Nova server." msgstr "Introduzca la región del servidor Nova." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" +#, fuzzy +#| msgid "Nova admin tenant ID:" +msgid "Nova admin tenant name:" msgstr "ID del inquilino («tenant») administrador de Nova:" #. Type: string #. Description #: ../neutron-common.templates:17001 +#, fuzzy +#| msgid "" +#| "Neutron needs to be able to communicate with Nova through Keystone. " +#| "Therefore Neutron needs to know the Nova admin tenant ID, username and " +#| "password." msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" "Neutron necesita poder comunicarse con Nova a través de Keystone. Por lo " @@ -462,14 +466,12 @@ msgstr "Introduzca el ID del inquilino («tenant») administrador de Nova." #. Type: string #. Description #: ../neutron-common.templates:18001 -#| msgid "Auth server username:" msgid "Neutron administrator username:" msgstr "Nombre de usuario del administrador de Neutron:" #. Type: string #. Description #: ../neutron-common.templates:18001 -#| msgid "Please specify the username to use with the authentication server." msgid "Please enter the username of the Nova administrator." msgstr "Introduzca el nombre de usuario del administrador de Nova." @@ -482,7 +484,6 @@ msgstr "Contraseña del administrador de Nova:" #. Type: password #. Description #: ../neutron-common.templates:19001 -#| msgid "Please specify the password to use with the authentication server." msgid "Please enter the password of the Nova administrator." msgstr "Introduzca la contraseña del administrador de Nova." @@ -507,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." @@ -531,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 " @@ -574,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 " @@ -673,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 b5cf51d5b..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: 2015-02-02 01:45+0100\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" @@ -57,8 +57,7 @@ msgstr "Identifiant sur le serveur d'authentification :" #: ../neutron-common.templates:4001 msgid "Please specify the username to use with the authentication server." msgstr "" -"Veuillez indiquer l'identifiant à utiliser sur le serveur " -"d'authentification." +"Veuillez indiquer l'identifiant à utiliser sur le serveur d'authentification." #. Type: password #. Description @@ -271,8 +270,8 @@ msgstr "Identifiant pour la connexion au serveur RabbitMQ :" #: ../neutron-common.templates:9001 msgid "Please specify the username used to connect to the RabbitMQ server." msgstr "" -"Veuillez indiquer l'identifiant à utiliser pour la connexion au " -"serveur RabbitMQ." +"Veuillez indiquer l'identifiant à utiliser pour la connexion au serveur " +"RabbitMQ." #. Type: password #. Description @@ -425,15 +424,22 @@ msgstr "Veuillez indiquer la région du serveur Nova." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" +#, fuzzy +#| msgid "Nova admin tenant ID:" +msgid "Nova admin tenant name:" msgstr "Identifiant du client administrateur pour Nova :" #. Type: string #. Description #: ../neutron-common.templates:17001 +#, fuzzy +#| msgid "" +#| "Neutron needs to be able to communicate with Nova through Keystone. " +#| "Therefore Neutron needs to know the Nova admin tenant ID, username and " +#| "password." msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" "Neutron doit pouvoir communiquer avec Nova au travers de Keystone. Cependant " @@ -491,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." @@ -515,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 " @@ -558,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 " @@ -587,8 +619,8 @@ msgid "" "Please specify the URL of your Neutron authentication server. Typically this " "is also the URL of your OpenStack Identity Service (Keystone)." msgstr "" -"Veuillez indiquer l'adresse URL du serveur d'authentification Neutron. " -"En général il s'agit du Service d'Identité d'OpenStack (Keystone)." +"Veuillez indiquer l'adresse URL du serveur d'authentification Neutron. En " +"général il s'agit du Service d'Identité d'OpenStack (Keystone)." #. Type: string #. Description @@ -657,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 3c594e943..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: 2015-02-02 01:45+0100\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" @@ -422,15 +422,17 @@ msgstr "Inserire l'indirizzo IP di tale server." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" -msgstr "" +#, fuzzy +#| msgid "Auth server username:" +msgid "Nova admin tenant name:" +msgstr "Nome utente per il server di autenticazione:" #. Type: string #. Description #: ../neutron-common.templates:17001 msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" @@ -491,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." @@ -515,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 " @@ -557,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 " @@ -649,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 00b1dcb37..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: 2015-02-02 01:45+0100\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" @@ -407,36 +407,40 @@ msgstr "URL van de Novaserver:" #. Type: string #. Description #: ../neutron-common.templates:15001 -#| msgid "Please specify the IP address of that server." msgid "Please enter the URL of the Nova server." msgstr "Gelieve het IP-adres van de Novaserver op te geven." #. Type: string #. Description #: ../neutron-common.templates:16001 -#| msgid "Auth server tenant name:" msgid "Nova server region name:" msgstr "Naam van de regio van de Novaserver:" #. Type: string #. Description #: ../neutron-common.templates:16001 -#| msgid "Please specify the IP address of that server." msgid "Please enter the region of the Nova server." msgstr "Gelieve de regio van de Novaserver op te geven." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" +#, fuzzy +#| msgid "Nova admin tenant ID:" +msgid "Nova admin tenant name:" msgstr "ID van de clientruimte (tenant) van de beheerder van Nova:" #. Type: string #. Description #: ../neutron-common.templates:17001 +#, fuzzy +#| msgid "" +#| "Neutron needs to be able to communicate with Nova through Keystone. " +#| "Therefore Neutron needs to know the Nova admin tenant ID, username and " +#| "password." msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" "Neutron moet met Nova kunnen communiceren via Keystone. Om die reden moet " @@ -454,14 +458,12 @@ msgstr "" #. Type: string #. Description #: ../neutron-common.templates:18001 -#| msgid "Auth server username:" msgid "Neutron administrator username:" msgstr "Gebruikersnaam van de beheerder van Neutron:" #. Type: string #. Description #: ../neutron-common.templates:18001 -#| msgid "Please specify the username to use with the authentication server." msgid "Please enter the username of the Nova administrator." msgstr "Gelieve de gebruikersnaam van de Nova-beheerder in te voeren." @@ -474,7 +476,6 @@ msgstr "Wachtwoord van de Nova-beheerder:" #. Type: password #. Description #: ../neutron-common.templates:19001 -#| msgid "Please specify the password to use with the authentication server." msgid "Please enter the password of the Nova administrator." msgstr "Gelieve het wachtwoord van de Nova-beheerder in te voeren." @@ -499,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." @@ -523,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 " @@ -565,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 " @@ -664,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 8ea2f587a..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: 2015-02-02 01:45+0100\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" @@ -404,41 +404,45 @@ msgstr "URL do servidor Nova:" #. Type: string #. Description #: ../neutron-common.templates:15001 -#| msgid "Please specify the IP address of that server." msgid "Please enter the URL of the Nova server." msgstr "Por favor indique o URL do servidor Nova." #. Type: string #. Description #: ../neutron-common.templates:16001 -#| msgid "Auth server tenant name:" msgid "Nova server region name:" msgstr "Nome de região do servidor Nova:" #. Type: string #. Description #: ../neutron-common.templates:16001 -#| msgid "Please specify the IP address of that server." msgid "Please enter the region of the Nova server." msgstr "Por favor indique a região do servidor Nova." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" +#, fuzzy +#| msgid "Nova admin tenant ID:" +msgid "Nova admin tenant name:" msgstr "ID do \"tenant admin\" do Nova:" #. Type: string #. Description #: ../neutron-common.templates:17001 +#, fuzzy +#| msgid "" +#| "Neutron needs to be able to communicate with Nova through Keystone. " +#| "Therefore Neutron needs to know the Nova admin tenant ID, username and " +#| "password." msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" -"O Neutron precisa de ser capaz de comunicar com o Nova através do " -"Keystone. Por isso o Neutron precisa de saber o ID tenant admin, o nome " -"de utilizador e palavra passe do Nova." +"O Neutron precisa de ser capaz de comunicar com o Nova através do Keystone. " +"Por isso o Neutron precisa de saber o ID tenant admin, o nome de utilizador " +"e palavra passe do Nova." #. Type: string #. Description @@ -449,14 +453,12 @@ msgstr "Por favor indique o ID do \"tenant admin\" para o Nova." #. Type: string #. Description #: ../neutron-common.templates:18001 -#| msgid "Auth server username:" msgid "Neutron administrator username:" msgstr "Nome de utilizador do administrador do Neutron:" #. Type: string #. Description #: ../neutron-common.templates:18001 -#| msgid "Please specify the username to use with the authentication server." msgid "Please enter the username of the Nova administrator." msgstr "Por favor indique o nome de utilizador do administrador do Nova." @@ -469,7 +471,6 @@ msgstr "Palavra passe do administrador do Nova:" #. Type: password #. Description #: ../neutron-common.templates:19001 -#| msgid "Please specify the password to use with the authentication server." msgid "Please enter the password of the Nova administrator." msgstr "Por favor indique a palavra passe do administrador do Nova." @@ -494,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." @@ -518,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 " @@ -561,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 " @@ -644,9 +671,9 @@ msgid "" "through the Neutron metadata agent, which serves as a proxy to the Nova " "metadata REST API server." msgstr "" -"As instâncias VM que usam o Neutron para lidar com a rede obtêm os seus " -"meta-dados através do agente de meta-dados do Neutron, o qual server como " -"um proxy para o servidor REST API de meta-dados do Nova." +"As instâncias VM que usam o Neutron para lidar com a rede obtêm os seus meta-" +"dados através do agente de meta-dados do Neutron, o qual server como um " +"proxy para o servidor REST API de meta-dados do Nova." #. Type: password #. Description @@ -657,9 +684,19 @@ msgid "" "same shared password should be used when setting up the nova-common package." msgstr "" "Por favor indique a palavra passe que deverá ser usada para proteger a " -"comunicação entre o agente proxy de meta-dados do Neutron e o servidor " -"de meta-dados do Nova. A mesma palavra passe partilhada deve ser usada " -"quando configurar o pacote nova-common." +"comunicação entre o agente proxy de meta-dados do Neutron e o servidor de " +"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 b25e22722..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: 2015-02-02 01:45+0100\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" @@ -416,15 +416,17 @@ msgstr "Укажите IP-адрес этого сервера." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" -msgstr "" +#, fuzzy +#| msgid "Auth server username:" +msgid "Nova admin tenant name:" +msgstr "Имя пользователя сервера аутентификации:" #. Type: string #. Description #: ../neutron-common.templates:17001 msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" @@ -485,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." @@ -508,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 " @@ -550,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 " @@ -642,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 4325e4271..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: 2015-02-02 01:45+0100\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" @@ -422,15 +422,17 @@ msgstr "Ange IP-adressen för den servern." #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" -msgstr "" +#, fuzzy +#| msgid "Auth server username:" +msgid "Nova admin tenant name:" +msgstr "Användarnamn på identifieringsservern:" #. Type: string #. Description #: ../neutron-common.templates:17001 msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" @@ -493,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 @@ -514,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 " @@ -556,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 " @@ -646,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 44c5cdcb5..6a07d129c 100644 --- a/trusty/debian/po/templates.pot +++ b/trusty/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the neutron package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: neutron\n" "Report-Msgid-Bugs-To: neutron@packages.debian.org\n" -"POT-Creation-Date: 2015-02-02 01:45+0100\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" @@ -382,7 +382,7 @@ msgstr "" #. Type: string #. Description #: ../neutron-common.templates:17001 -msgid "Nova admin tenant ID:" +msgid "Nova admin tenant name:" msgstr "" #. Type: string @@ -390,7 +390,7 @@ msgstr "" #: ../neutron-common.templates:17001 msgid "" "Neutron needs to be able to communicate with Nova through Keystone. " -"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"Therefore Neutron needs to know the Nova admin tenant name, username and " "password." msgstr "" @@ -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 " diff --git a/trusty/debian/rules b/trusty/debian/rules index e8567ecae..2daf47adb 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -123,7 +123,7 @@ override_dh_clean: override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - PYTHONPATH=build/* ./run_tests.sh -N -P || true + PYTHONPATH=build/* ./run_tests.sh -N -P endif override_dh_auto_build: -- 2.32.3