From 0f59be3f1c3261596bd698018fa7f000a71d3a26 Mon Sep 17 00:00:00 2001 From: Jerzy Mikolajczak Date: Wed, 20 Jul 2016 15:35:32 +0200 Subject: [PATCH] Update neutron to 9.0.0~b2 Xenial: - Update requirements based on project requirements - Source [0] - Add missing dependencies (radvd, python-openvswitch, python-pyroute2) Commits a5a14ee 918a100 f28290b - Add doc package and git as a build dependency Centos7: - Update requirements based on project requirements - Add doc package - Remove neutron-bgp-dragent service from spec and sources [0] http://anonscm.debian.org/git/openstack/neutron.git/?h=debian%2Fnewton Change-Id: Ib914b36b82e2e1e3628bd2cfeac3ac8b5a46e8db --- .../rpm/SOURCES/neutron-bgp-dragent.service | 14 -- centos7/rpm/SPECS/openstack-neutron.spec | 14 +- xenial/debian/changelog | 22 ++- xenial/debian/control | 36 ++--- xenial/debian/neutron-common.config.in | 76 ++++----- xenial/debian/neutron-common.postinst.in | 52 ++----- xenial/debian/neutron-common.templates | 4 +- .../debian/patches/fix-requirements.txt.patch | 14 +- xenial/debian/plugin_guess_func | 146 +++--------------- xenial/debian/po/da.po | 46 ++---- 10 files changed, 122 insertions(+), 302 deletions(-) delete mode 100644 centos7/rpm/SOURCES/neutron-bgp-dragent.service diff --git a/centos7/rpm/SOURCES/neutron-bgp-dragent.service b/centos7/rpm/SOURCES/neutron-bgp-dragent.service deleted file mode 100644 index 7af78d7a5..000000000 --- a/centos7/rpm/SOURCES/neutron-bgp-dragent.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=OpenStack Neutron BGP Dynamic Routing agent -After=syslog.target - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-bgp-dragent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-bgp-dragent --log-file /var/log/neutron/bgp-dragent.log -PrivateTmp=true -KillMode=process -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index 5fdc1da32..fd5bb1a2c 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -2,7 +2,7 @@ Name: openstack-%{service} Version: 9.0.0~b2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: OpenStack Networking Service @@ -15,7 +15,6 @@ 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 @@ -27,7 +26,6 @@ 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 @@ -111,7 +109,7 @@ 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-keystoneauth1 >= 2.7.0 Requires: python-keystoneclient >= 1.6.0 Requires: python-keystonemiddleware >= 4.0.0 Requires: python-netaddr >= 0.7.12 @@ -121,7 +119,7 @@ Requires: python-novaclient >= 2.29.0 Requires: python-openvswitch Requires: python-oslo-cache >= 1.5.0 Requires: python-oslo-concurrency >= 3.8.0 -Requires: python-oslo-config >= 2:3.10.0 +Requires: python-oslo-config >= 2:3.12.0 Requires: python-oslo-context >= 2.4.0 Requires: python-oslo-db >= 4.1.0 Requires: python-oslo-i18n >= 2.1.0 @@ -133,7 +131,7 @@ 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.10.0 -Requires: python-oslo-utils >= 3.11.0 +Requires: python-oslo-utils >= 3.15.0 Requires: python-oslo-versionedobjects >= 1.9.1 Requires: python-osprofiler >= 1.3.0 Requires: python-paste @@ -147,7 +145,7 @@ 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-stevedore >= 1.15.0 Requires: python-unicodecsv Requires: python-webob >= 1.2.3 @@ -726,6 +724,8 @@ fi %changelog +* Wed Jul 19 2016 Jerzy Mikolajczak 1:9.0.0~b2-2.el7 +- Update specs for Newton b2 release * Mon Jul 18 2016 Sergey Kolekonov 1:9.0.0~b2-1.el7 - Add Restart=always directive for systemd units * Mon Jun 27 2016 Jerzy Mikolajczak 1:9.0.0.0b1-1.el7 diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 53b55b17e..b2c91e706 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,17 +1,29 @@ -neutron (2:9.0.0~b1-2~u16.04+mos1) mos10.0; urgency=medium +neutron (2:9.0.0~b2-1~u16.04+mos1) mos10.0; urgency=medium - * Update to latest release + * Update to latest Newton b2 release * Requirements update based on project requirements * Source: http://anonscm.debian.org/git/openstack/neutron.git/?h=debian%2Fnewton - -- Jerzy Mikolajczak Fri, 24 Jun 2016 13:33:15 +0200 + -- Jerzy Mikolajczak Wed, 20 Jul 2016 15:29:47 +0200 -neutron (2:9.0.0~b1-2) UNRELEASED; urgency=medium +neutron (2:9.0.0~b2-1) experimental; urgency=medium + * New upstream release. + * Fixed (build-)depends for this release. * Activates qos policies by default. * neutron-server loads fwaas_driver.ini if it is present in /etc/neutron. + * Refresh the core_plugin selection logic so it's up-to-date. + * Updated Danish translation of debconf templates (Closes: #830637). + + -- Thomas Goirand Fri, 15 Jul 2016 15:17:21 +0200 - -- Thomas Goirand Fri, 17 Jun 2016 14:33:59 +0200 +neutron (2:9.0.0~b1-2~u16.04+mos1) mos10.0; urgency=medium + + * Update to latest release + * Requirements update based on project requirements + * Source: http://anonscm.debian.org/git/openstack/neutron.git/?h=debian%2Fnewton + + -- Jerzy Mikolajczak Fri, 24 Jun 2016 13:33:15 +0200 neutron (2:9.0.0~b1-1) experimental; urgency=medium diff --git a/xenial/debian/control b/xenial/debian/control index d68bf0c59..1c9537c28 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -23,38 +23,38 @@ Build-Depends-Indep: alembic (>= 0.8.4), python-debtcollector (>= 1.2.0), python-designateclient (>= 1.5.0), python-eventlet (>= 0.18.4), - python-fixtures (>= 1.3.1), + python-fixtures (>= 3.0.0), python-gflags, python-greenlet, python-hacking, python-httplib2, python-jinja2 (>= 2.8), - python-keystoneauth1 (>= 2.1.0), + python-keystoneauth1 (>= 2.7.0), python-keystonemiddleware (>= 4.0.0), python-mock (>= 1.3), python-netaddr (>= 0.7.12), python-netifaces (>= 0.10.4), - python-neutronclient (>= 1:4.2.0), python-neutron-lib (>= 0.2.0), + python-neutronclient (>= 1:4.2.0), python-novaclient (>= 2:2.30.1), python-openvswitch, - python-os-testr (>= 0.4.2), + python-os-testr (>= 0.7.0), python-oslo.cache (>= 1.5.0), python-oslo.concurrency (>= 3.8.0), - python-oslo.config (>= 1:3.9.0), - python-oslo.context (>= 2.2.0), + python-oslo.config (>= 1:3.10.0), + python-oslo.context (>= 2.4.0), python-oslo.db (>= 4.1.0), python-oslo.i18n (>= 2.1.0), python-oslo.log (>= 2.0.0), - python-oslo.messaging (>= 4.5.0), + python-oslo.messaging (>= 5.2.0), python-oslo.middleware (>= 3.0.0), - python-oslo.policy (>= 0.5.0), + python-oslo.policy (>= 1.9.0), python-oslo.reports (>= 0.6.0), python-oslo.rootwrap (>= 2.0.0), python-oslo.serialization (>= 2.0.0), python-oslo.service (>= 1.10.0), - python-oslo.utils (>= 3.5.0), - python-oslo.versionedobjects (>= 1.5.0), + python-oslo.utils (>= 3.14.0), + python-oslo.versionedobjects (>= 1.9.1), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.10.0), python-osprofiler (>= 1.3.0), @@ -98,31 +98,31 @@ Depends: alembic (>= 0.8.4), python-greenlet, python-httplib2, python-jinja2 (>= 2.8), - python-keystoneauth1 (>= 2.1.0), + python-keystoneauth1 (>= 2.7.0), python-keystonemiddleware (>= 4.0.0), python-mysqldb, python-netaddr (>= 0.7.12), python-netifaces (>= 0.10.4), - python-neutronclient (>= 1:4.2.0), python-neutron-lib (>= 0.2.0), + python-neutronclient (>= 1:4.2.0), python-novaclient (>= 2:2.30.1), python-openvswitch, python-oslo.cache (>= 1.5.0), python-oslo.concurrency (>= 3.8.0), - python-oslo.config (>= 1:3.9.0), - python-oslo.context (>= 2.2.0), + python-oslo.config (>= 1:3.10.0), + python-oslo.context (>= 2.4.0), python-oslo.db (>= 4.1.0), python-oslo.i18n (>= 2.1.0), python-oslo.log (>= 2.0.0), - python-oslo.messaging (>= 4.5.0), + python-oslo.messaging (>= 5.2.0), python-oslo.middleware (>= 3.0.0), - python-oslo.policy (>= 0.5.0), + python-oslo.policy (>= 1.9.0), python-oslo.reports (>= 0.6.0), python-oslo.rootwrap (>= 2.0.0), python-oslo.serialization (>= 2.0.0), python-oslo.service (>= 1.10.0), - python-oslo.utils (>= 3.5.0), - python-oslo.versionedobjects (>= 1.5.0), + python-oslo.utils (>= 3.14.0), + python-oslo.versionedobjects (>= 1.9.1), python-osprofiler (>= 1.3.0), python-paste, python-pastedeploy, diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in index 46e8e8ed5..343a6003f 100644 --- a/xenial/debian/neutron-common.config.in +++ b/xenial/debian/neutron-common.config.in @@ -9,56 +9,32 @@ OVS_CONF=/etc/neutron/plugins/ml2/openvswitch_agent.ini # Please remember this function is also in debian/plugin_guess_func neutron_core_plugin_to_plugin_name () { - case ${1} in - "neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2") - NEUTRON_PLUGIN_NAME=OpenVSwitch - ;; - "neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2") - NEUTRON_PLUGIN_NAME=LinuxBridge - ;; - "neutron.plugins.ml2.plugin.Ml2Plugin") - NEUTRON_PLUGIN_NAME=ml2 - ;; - "neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2") - NEUTRON_PLUGIN_NAME=RYU - ;; - "neutron.plugins.plumgrid.plumgrid_nos_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2") - NEUTRON_PLUGIN_NAME=PLUMgrid - ;; - "neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2") - NEUTRON_PLUGIN_NAME=Brocade - ;; - "neutron.plugins.hyperv.hyperv_neutron_plugin.HyperVNeutronPlugin") - NEUTRON_PLUGIN_NAME=Hyper-V - ;; - "neutron.plugins.bigswitch.plugin.NeutronRestProxyV2") - NEUTRON_PLUGIN_NAME=BigSwitch - ;; - "neutron.plugins.cisco.network_plugin.PluginV2") - NEUTRON_PLUGIN_NAME=Cisco - ;; - "neutron.plugins.nicira.NeutronPlugin.NvpPluginV2") - NEUTRON_PLUGIN_NAME=neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 - ;; - "neutron.plugins.midonet.plugin.MidonetPluginV2") - NEUTRON_PLUGIN_NAME=Midonet - ;; - "neutron.plugins.nec.nec_plugin.NECPluginV2") - NEUTRON_PLUGIN_NAME=Nec - ;; - "neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2") - NEUTRON_PLUGIN_NAME=MetaPlugin - ;; - "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin") - NEUTRON_PLUGIN_NAME=Mellanox - ;; - "vmware_nsx.plugin.NsxVPlugin") - NEUTRON_PLUGIN_NAME=VMware - ;; - *) - NEUTRON_PLUGIN_NAME="other" - ;; - esac + case ${1} in + "neutron.plugins.ml2.plugin.Ml2Plugin"|"ml2") + NEUTRON_PLUGIN_NAME=ml2 + ;; + "networking_plumgrid.neutron.plugins.plugin:NeutronPluginPLUMgridV2"|"plumgrid") + NEUTRON_PLUGIN_NAME=plumgrid + ;; + "midonet.neutron.plugin_v1:MidonetPluginV2"|"modonet") + NEUTRON_PLUGIN_NAME=midonet + ;; + "midonet.neutron.plugin_v2:MidonetPluginV2"|"midonet_v2") + NEUTRON_PLUGIN_NAME=midonet_v2 + ;; + "networking_nec.nwa.l2.plugin:NECNWAL2Plugin"|"necnwa") + NEUTRON_PLUGIN_NAME=nec + ;; + "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin") + NEUTRON_PLUGIN_NAME=mellanox + ;; + "vmware_nsx.plugin:NsxMhPlugin"|"vmware") + NEUTRON_PLUGIN_NAME=vmware + ;; + *) + NEUTRON_PLUGIN_NAME="other" + ;; + esac } #PKGOS-INCLUDE# diff --git a/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in index e65290df9..754d1ed2b 100644 --- a/xenial/debian/neutron-common.postinst.in +++ b/xenial/debian/neutron-common.postinst.in @@ -9,47 +9,23 @@ OVS_CONF=/etc/neutron/plugins/ml2/openvswitch_agent.ini neutron_core_plugin_class () { case ${1} in - "OpenVSwitch") - NEUTRON_PLUGIN_CLASS=neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 + "OpenVSwitch"|"ml2"|"LinuxBridge"|"neutron.plugins.ml2.plugin.Ml2Plugin") + NEUTRON_PLUGIN_CLASS=ml2 ;; - "ml2") - NEUTRON_PLUGIN_CLASS=neutron.plugins.ml2.plugin.Ml2Plugin + "networking_plumgrid.neutron.plugins.plugin:NeutronPluginPLUMgridV2"|"plumgrid") + NEUTRON_PLUGIN_NAME=plumgrid ;; - "LinuxBridge") - NEUTRON_PLUGIN_CLASS=neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2 + "midonet.neutron.plugin_v1:MidonetPluginV2"|"midonet") + NEUTRON_PLUGIN_NAME=midonet ;; - "RYU") - NEUTRON_PLUGIN_CLASS=neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2 + "midonet.neutron.plugin_v2:MidonetPluginV2"|"midonet_v2") + NEUTRON_PLUGIN_NAME=midonet_v2 ;; - "PLUMgrid") - NEUTRON_PLUGIN_CLASS=neutron.plugins.plumgrid.plumgrid_nos_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2 + "networking_nec.nwa.l2.plugin:NECNWAL2Plugin"|"necnwa") + NEUTRON_PLUGIN_NAME=nec ;; - "Brocade") - NEUTRON_PLUGIN_CLASS=neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2 - ;; - "Hyper-V") - NEUTRON_PLUGIN_CLASS=neutron.plugins.hyperv.hyperv_neutron_plugin.HyperVNeutronPlugin - ;; - "BigSwitch") - NEUTRON_PLUGIN_CLASS=neutron.plugins.bigswitch.plugin.NeutronRestProxyV2 - ;; - "Cisco") - NEUTRON_PLUGIN_CLASS=neutron.plugins.cisco.network_plugin.PluginV2 - ;; - "Nicira") - NEUTRON_PLUGIN_CLASS=neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 - ;; - "Midonet") - NEUTRON_PLUGIN_CLASS=neutron.plugins.midonet.plugin.MidonetPluginV2 - ;; - "Nec") - NEUTRON_PLUGIN_CLASS=neutron.plugins.nec.nec_plugin.NECPluginV2 - ;; - "MetaPlugin") - NEUTRON_PLUGIN_CLASS=neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2 - ;; - "Mellanox") - NEUTRON_PLUGIN_CLASS=neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin + "vmware_nsx.plugin:NsxMhPlugin"|"vmware") + NEUTRON_PLUGIN_NAME=vmware ;; *) NEUTRON_PLUGIN_CLASS="" @@ -91,7 +67,9 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then NEUTRON_plugin=${RET} if [ -n "${RET}" ] ; then neutron_core_plugin_class ${NEUTRON_plugin} - pkgos_inifile set ${N_CONF} DEFAULT core_plugin ${NEUTRON_PLUGIN_CLASS} + if [ -n "${NEUTRON_PLUGIN_CLASS}" ] ; then + pkgos_inifile set ${N_CONF} DEFAULT core_plugin ${NEUTRON_PLUGIN_CLASS} + fi fi # Write the neutron RabbitMQ credentials diff --git a/xenial/debian/neutron-common.templates b/xenial/debian/neutron-common.templates index 3b0910bc8..e2573d546 100644 --- a/xenial/debian/neutron-common.templates +++ b/xenial/debian/neutron-common.templates @@ -33,8 +33,8 @@ _Description: Authentication server password: Template: neutron/plugin-select Type: select -__Choices: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, MetaPlugin, BigSwitch, Cisco, PLUMgrid -Choices-C: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, MetaPlugin, BigSwitch, Cisco, PLUMgrid +__Choices: ml2, plumgrid, midonet, midonet_v2, nec, vmware, other +Choices-C: ml2, plumgrid, midonet, midonet_v2, nec, vmware, other Default: ml2 _Description: Neutron plugin: Neutron uses a plugin architecture to manage networking. When starting the diff --git a/xenial/debian/patches/fix-requirements.txt.patch b/xenial/debian/patches/fix-requirements.txt.patch index 475cae221..6c8d3e8fc 100644 --- a/xenial/debian/patches/fix-requirements.txt.patch +++ b/xenial/debian/patches/fix-requirements.txt.patch @@ -1,16 +1,18 @@ Description: Fix requirements.txt Author: Jerzy Mikolajczak Forwarded: not-needed -Last-Update: 2016-07-01 +Last-Update: 2016-07-21 ---- neutron-9.0.0~b1.orig/requirements.txt -+++ neutron-9.0.0~b1/requirements.txt +Index: neutron/requirements.txt +=================================================================== +--- neutron.orig/requirements.txt 2016-07-21 09:54:44.000000000 +0200 ++++ neutron/requirements.txt 2016-07-21 12:05:23.196106155 +0200 @@ -44,8 +44,6 @@ - oslo.utils>=3.11.0 # Apache-2.0 - oslo.versionedobjects>=1.9.1 # Apache-2.0 + oslo.utils>=3.15.0 # Apache-2.0 + oslo.versionedobjects>=1.13.0 # Apache-2.0 osprofiler>=1.3.0 # Apache-2.0 -ovs>=2.5.0;python_version=='2.7' # Apache-2.0 -ovs>=2.6.0.dev1;python_version>='3.4' # Apache-2.0 - + python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 python-designateclient>=1.5.0 # Apache-2.0 diff --git a/xenial/debian/plugin_guess_func b/xenial/debian/plugin_guess_func index 281152abb..28f969289 100644 --- a/xenial/debian/plugin_guess_func +++ b/xenial/debian/plugin_guess_func @@ -6,50 +6,23 @@ ### Guess the plugin name depending on the class of the plugin in /etc/neutron/neutron.conf ### neutron_core_plugin_to_plugin_name () { case ${1} in - "neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2") - NEUTRON_PLUGIN_NAME=OpenVSwitch - ;; - "neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2") - NEUTRON_PLUGIN_NAME=LinuxBridge - ;; - "neutron.plugins.ml2.plugin.Ml2Plugin") + "neutron.plugins.ml2.plugin.Ml2Plugin"|"ml2") NEUTRON_PLUGIN_NAME=ml2 ;; - "neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2") - NEUTRON_PLUGIN_NAME=RYU - ;; - "neutron.plugins.plumgrid.plumgrid_nos_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2") - NEUTRON_PLUGIN_NAME=PLUMgrid - ;; - "neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2") - NEUTRON_PLUGIN_NAME=Brocade - ;; - "neutron.plugins.hyperv.hyperv_neutron_plugin.HyperVNeutronPlugin") - NEUTRON_PLUGIN_NAME=Hyper-V - ;; - "neutron.plugins.bigswitch.plugin.NeutronRestProxyV2") - NEUTRON_PLUGIN_NAME=BigSwitch + "networking_plumgrid.neutron.plugins.plugin:NeutronPluginPLUMgridV2"|"plumgrid") + NEUTRON_PLUGIN_NAME=plumgrid ;; - "neutron.plugins.cisco.network_plugin.PluginV2") - NEUTRON_PLUGIN_NAME=Cisco + "midonet.neutron.plugin_v1:MidonetPluginV2"|"midonet") + NEUTRON_PLUGIN_NAME=midonet ;; - "neutron.plugins.nicira.NeutronPlugin.NvpPluginV2") - NEUTRON_PLUGIN_NAME=neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 + "midonet.neutron.plugin_v2:MidonetPluginV2"|"midonet_v2") + NEUTRON_PLUGIN_NAME=midonet_v2 ;; - "neutron.plugins.midonet.plugin.MidonetPluginV2") - NEUTRON_PLUGIN_NAME=Midonet + "networking_nec.nwa.l2.plugin:NECNWAL2Plugin"|"necnwa") + NEUTRON_PLUGIN_NAME=nec ;; - "neutron.plugins.nec.nec_plugin.NECPluginV2") - NEUTRON_PLUGIN_NAME=Nec - ;; - "neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2") - NEUTRON_PLUGIN_NAME=MetaPlugin - ;; - "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin") - NEUTRON_PLUGIN_NAME=Mellanox - ;; - "vmware_nsx.plugin.NsxVPlugin") - NEUTRON_PLUGIN_NAME=VMware + "vmware_nsx.plugin:NsxMhPlugin"|"vmware") + NEUTRON_PLUGIN_NAME=vmware ;; *) NEUTRON_PLUGIN_NAME="other" @@ -61,107 +34,26 @@ neutron_core_plugin_to_plugin_name () { neutron_plugin_ini_path () { PLUG_INI_BASE=/etc/neutron/plugins/ case ${1} in - "OpenVSwitch") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}ml2/openvswitch_agent.ini - ;; - "LinuxBridge") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}linuxbridge/linuxbridge_conf.ini - ;; "ml2") NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}ml2/ml2_conf.ini ;; - "RYU") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}ryu/ryu.ini - ;; - "PLUMgrid") + "plumgrid") NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}plumgrid/plumgrid.ini ;; - "Brocade") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}brocade/brocade.ini - ;; - "Hyper-V") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}hyperv/hyperv_neutron_plugin.ini - ;; - "BigSwitch") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}bigswitch/restproxy.ini - ;; - "Cisco") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}cisco/cisco_plugins.ini - ;; - "Nicira") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}nicira/nvp.ini + "midonet") + NEUTRON_PLUGIN_CONFIG=/etc/midonet/midonet.ini.v1 ;; - "Midonet") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}midonet/midonet.ini + "midonet_v2") + NEUTRON_PLUGIN_CONFIG=/etc/midonet/midonet.ini.v2 ;; - "Nec") + "nec") NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}nec/nec.ini ;; - "MetaPlugin") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}metaplugin/metaplugin.ini - ;; - "Mellanox") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}mlnx/mlnx_conf.ini - ;; - "VMware") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}vmware/nsx.ini + "vmware") + NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}nsx/nsx.ini ;; *) NEUTRON_PLUGIN_CONFIG="" ;; esac } - -### Translates the core_plugin directive value from neutron.conf into the plugin name ### -neutron_core_plugin_to_plugin_name () { - case ${1} in - "neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2") - NEUTRON_PLUGIN_NAME=OpenVSwitch - ;; - "neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2") - NEUTRON_PLUGIN_NAME=LinuxBridge - ;; - "neutron.plugins.ml2.plugin.Ml2Plugin") - NEUTRON_PLUGIN_NAME=ml2 - ;; - "neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2") - NEUTRON_PLUGIN_NAME=RYU - ;; - "neutron.plugins.plumgrid.plumgrid_nos_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2") - NEUTRON_PLUGIN_NAME=PLUMgrid - ;; - "neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2") - NEUTRON_PLUGIN_NAME=Brocade - ;; - "neutron.plugins.hyperv.hyperv_neutron_plugin.HyperVNeutronPlugin") - NEUTRON_PLUGIN_NAME=Hyper-V - ;; - "neutron.plugins.bigswitch.plugin.NeutronRestProxyV2") - NEUTRON_PLUGIN_NAME=BigSwitch - ;; - "neutron.plugins.cisco.network_plugin.PluginV2") - NEUTRON_PLUGIN_NAME=Cisco - ;; - "neutron.plugins.nicira.NeutronPlugin.NvpPluginV2") - NEUTRON_PLUGIN_NAME=neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 - ;; - "neutron.plugins.midonet.plugin.MidonetPluginV2") - NEUTRON_PLUGIN_NAME=Midonet - ;; - "neutron.plugins.nec.nec_plugin.NECPluginV2") - NEUTRON_PLUGIN_NAME=Nec - ;; - "neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2") - NEUTRON_PLUGIN_NAME=MetaPlugin - ;; - "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin") - NEUTRON_PLUGIN_NAME=Mellanox - ;; - "vmware_nsx.plugin.NsxVPlugin") - NEUTRON_PLUGIN_NAME=VMware - ;; - *) - NEUTRON_PLUGIN_NAME="other" - ;; - esac -} diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po index 839b81a63..eeda42a0c 100644 --- a/xenial/debian/po/da.po +++ b/xenial/debian/po/da.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: neutron\n" "Report-Msgid-Bugs-To: neutron@packages.debian.org\n" "POT-Creation-Date: 2016-06-06 00:25+0200\n" -"PO-Revision-Date: 2015-05-31 17:30+01:00\n" +"PO-Revision-Date: 2016-07-09 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -415,26 +415,19 @@ msgstr "Angiv venligst regionen for Novaserveren." #. Type: string #. Description #: ../neutron-common.templates:17001 -#, fuzzy -#| msgid "Nova admin tenant ID:" msgid "Nova admin tenant name:" -msgstr "Tenant-id for Novaadministratoren:" +msgstr "Tenant-navn 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 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 " +"skal Neutron kende til tenant-navnet for Novaadministratoren, brugernavn og " "adgangskode." #. Type: string @@ -488,17 +481,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 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." +"et kendt administratorprojektnavn, administratorbrugernavn og adgangskode. " +"Administratorens godkendelsessymbol bruges ikke længere." #. Type: string #. Description @@ -519,10 +509,8 @@ msgstr "" #. Type: string #. Description #: ../neutron-server.templates:4001 -#, fuzzy -#| msgid "Neutron administrator username:" msgid "Keystone admin name:" -msgstr "Neutron-administratorbrugernavn:" +msgstr "Aministratornavn for Keystone:" #. Type: string #. Description @@ -536,22 +524,20 @@ msgid "" "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 registrere tjenesteslutpunkt skal denne pakke kende " +"administratorlogind, projektnavn og adgangskode til Keystoneserveren." #. Type: string #. Description #: ../neutron-server.templates:5001 -#, fuzzy -#| msgid "Nova admin tenant ID:" msgid "Keystone admin project name:" -msgstr "Tenant-id for Novaadministratoren:" +msgstr "Projektnavn for Keystoneadministratoren:" #. Type: password #. Description #: ../neutron-server.templates:6001 -#, fuzzy -#| msgid "Nova administrator password:" msgid "Keystone admin password:" -msgstr "Adgangskode for Novaadministratoren:" +msgstr "Adgangskode for Keystoneadministratoren:" #. Type: string #. Description @@ -670,15 +656,3 @@ 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 "Auth server username:" -#~ msgstr "Brugernavn for godkendelsesserver:" - -#~ 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." -- 2.45.2