From 810d695f92751ce47fff968b0a3e5e235bf477e9 Mon Sep 17 00:00:00 2001 From: Sergii Rizvan Date: Fri, 17 Jun 2016 14:59:13 +0300 Subject: [PATCH] Remove the rest of MidoNet plugin from neutron Removing the rest of MidoNet plugin from the specs according to the commit d32d06673886ec78e4da9f1d20badd13bd616f1c in neutron project. Closes-Bug: 1594342 Change-Id: Ifd78aea1fc873272dd968610116ba9acdfcb8bde --- centos7/rpm/SPECS/openstack-neutron.spec | 24 +++--------------------- rpm/SPECS/openstack-neutron.spec | 18 ------------------ trusty/debian/changelog | 6 ++++++ trusty/debian/control | 17 ----------------- trusty/debian/neutron-common.config.in | 3 --- trusty/debian/neutron-common.postinst.in | 3 --- trusty/debian/neutron-common.templates | 4 ++-- trusty/debian/plugin_guess_func | 9 --------- trusty/debian/po/da.po | 6 ------ trusty/debian/po/de.po | 6 ------ trusty/debian/po/es.po | 6 ------ trusty/debian/po/fr.po | 6 ------ trusty/debian/po/it.po | 6 ------ trusty/debian/po/nl.po | 6 ------ trusty/debian/po/pt.po | 6 ------ trusty/debian/po/ru.po | 6 ------ trusty/debian/po/sv.po | 6 ------ trusty/debian/po/templates.pot | 6 ------ 18 files changed, 11 insertions(+), 133 deletions(-) diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index b1f45767e..5b8b7c742 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -2,7 +2,7 @@ Name: openstack-%{service} Version: 7.0.4 -Release: 2%{?dist}~mos8.0.1 +Release: 3%{?dist}~mos8.0.1 Epoch: 1 Summary: OpenStack Networking Service @@ -254,19 +254,6 @@ This plugin implements Neutron v2 APIs with support for Mellanox embedded switch functionality as part of the VPI (Ethernet/InfiniBand) HCA. -%package midonet -Summary: Neutron MidoNet plugin -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} - - -%description midonet -Neutron provides an API to dynamically request and configure virtual -networks. - -This package contains the Neutron plugin that implements virtual -networks using MidoNet from Midokura. - - %package ml2 Summary: Neutron ML2 plugin Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} @@ -790,13 +777,6 @@ fi %dir %{_sysconfdir}/%{service}/conf.d/%{service}-mlnx-agent -%files midonet -%license LICENSE -#%doc %{service}/plugins/midonet/README -%dir %{_sysconfdir}/%{service}/plugins/midonet -%config(noreplace) %attr(0640, root, %{service}) %{_sysconfdir}/%{service}/plugins/midonet/*.ini - - %files ml2 %license LICENSE %doc %{service}/plugins/ml2/README @@ -879,6 +859,8 @@ fi %changelog +* Thu Jun 20 2016 Sergey Kolekonov 1:7.0.4-3%{?dist}~mos8.0.1 +- Remove the rest of MidoNet plugin from neutron * Thu Jun 16 2016 Sergey Kolekonov 1:7.0.4-2%{?dist}~mos8.0.1 - Bump version according to the latest tag * Fri Dec 18 2015 Sergey Kolekonov 1:7.0.1-1%{?dist}~mos8.0.1 diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec index f72c700e3..412e3f3c5 100644 --- a/rpm/SPECS/openstack-neutron.spec +++ b/rpm/SPECS/openstack-neutron.spec @@ -249,24 +249,6 @@ This package contains the neutron plugin that implements virtual networks as VLANs using Linux bridging. -%package midonet -Summary: Neutron MidoNet plugin -Group: Applications/System - -Provides: openstack-quantum-midonet = %{version}-%{release} -Obsoletes: openstack-quantum-midonet < 2013.2-0.3.b3 - -Requires: openstack-neutron = %{version}-%{release} - - -%description midonet -Neutron provides an API to dynamically request and configure virtual -networks. - -This package contains the neutron plugin that implements virtual -networks using MidoNet from Midokura. - - %package ml2 Summary: Neutron ML2 plugin Group: Applications/System diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 975a8609c..38b1a9da5 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +neutron (2:7.0.4-3~u14.04+mos1) mos8.0; urgency=medium + + * Remove the rest of MidoNet plugin from neutron + + -- Sergey Kolekonov Mon, 20 Jun 2016 15:22:32 +0300 + neutron (2:7.0.4-2~u14.04+mos1) mos8.0; urgency=medium * Bump version to reflect current tag diff --git a/trusty/debian/control b/trusty/debian/control index b426d96b3..020dec0b6 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -429,23 +429,6 @@ Description: Neutron is a virtual network service for Openstack - Metaplugin plu . This package provides the Metaplugin plugin. -Package: neutron-plugin-midonet -Architecture: all -Provides: neutron-plugin, -Depends: neutron-common (= ${source:Version}), - ${misc:Depends}, -Description: Neutron is a virtual network service for Openstack - Midonet plugin - Neutron is a virtual network service for Openstack, and a part of - Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Neutron provides an API to - dynamically request and configure virtual networks. These networks - connect "interfaces" from other OpenStack services (e.g., virtual NICs - from Nova VMs). The Neutron API supports extensions to provide - advanced network capabilities (e.g., QoS, ACLs, network monitoring, - etc.) - . - This package provides the Midonet plugin. - Package: neutron-plugin-mlnx Architecture: all Provides: neutron-plugin, diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in index c890d4eda..7596a7dd5 100644 --- a/trusty/debian/neutron-common.config.in +++ b/trusty/debian/neutron-common.config.in @@ -40,9 +40,6 @@ neutron_core_plugin_to_plugin_name () { "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 ;; diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in index 7b813dc3b..fff05638f 100644 --- a/trusty/debian/neutron-common.postinst.in +++ b/trusty/debian/neutron-common.postinst.in @@ -39,9 +39,6 @@ neutron_core_plugin_class () { "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 ;; diff --git a/trusty/debian/neutron-common.templates b/trusty/debian/neutron-common.templates index d70480bdf..4f9c75136 100644 --- a/trusty/debian/neutron-common.templates +++ b/trusty/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: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, NEC, Mellanox, Hyper-V, RYU, MetaPlugin, BigSwitch, Cisco, PLUMgrid +Choices-C: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, NEC, Mellanox, Hyper-V, RYU, MetaPlugin, BigSwitch, Cisco, PLUMgrid Default: ml2 _Description: Neutron plugin: Neutron uses a plugin architecture to manage networking. When starting the diff --git a/trusty/debian/plugin_guess_func b/trusty/debian/plugin_guess_func index 281152abb..6ffd36c16 100644 --- a/trusty/debian/plugin_guess_func +++ b/trusty/debian/plugin_guess_func @@ -36,9 +36,6 @@ neutron_core_plugin_to_plugin_name () { "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 ;; @@ -91,9 +88,6 @@ neutron_plugin_ini_path () { "Nicira") NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}nicira/nvp.ini ;; - "Midonet") - NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}midonet/midonet.ini - ;; "Nec") NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}nec/nec.ini ;; @@ -145,9 +139,6 @@ neutron_core_plugin_to_plugin_name () { "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 ;; diff --git a/trusty/debian/po/da.po b/trusty/debian/po/da.po index 49236ced8..699d1ed4e 100644 --- a/trusty/debian/po/da.po +++ b/trusty/debian/po/da.po @@ -100,12 +100,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/de.po b/trusty/debian/po/de.po index 71805b877..67068f596 100644 --- a/trusty/debian/po/de.po +++ b/trusty/debian/po/de.po @@ -103,12 +103,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/es.po b/trusty/debian/po/es.po index ffd2d3b0b..0558c1f8c 100644 --- a/trusty/debian/po/es.po +++ b/trusty/debian/po/es.po @@ -119,12 +119,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/fr.po b/trusty/debian/po/fr.po index b5cf51d5b..ac1e5f04c 100644 --- a/trusty/debian/po/fr.po +++ b/trusty/debian/po/fr.po @@ -104,12 +104,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/it.po b/trusty/debian/po/it.po index 3c594e943..6c662179f 100644 --- a/trusty/debian/po/it.po +++ b/trusty/debian/po/it.po @@ -101,12 +101,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/nl.po b/trusty/debian/po/nl.po index 00b1dcb37..5c13ab0c0 100644 --- a/trusty/debian/po/nl.po +++ b/trusty/debian/po/nl.po @@ -103,12 +103,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/pt.po b/trusty/debian/po/pt.po index 8ea2f587a..b4c808683 100644 --- a/trusty/debian/po/pt.po +++ b/trusty/debian/po/pt.po @@ -104,12 +104,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po index 13c626221..d01deed50 100644 --- a/trusty/debian/po/ru.po +++ b/trusty/debian/po/ru.po @@ -100,12 +100,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/sv.po b/trusty/debian/po/sv.po index 4325e4271..e9d139d4d 100644 --- a/trusty/debian/po/sv.po +++ b/trusty/debian/po/sv.po @@ -103,12 +103,6 @@ msgstr "Brocade" msgid "Nicira" msgstr "Nicira" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "Midonet" - #. Type: select #. Choices #: ../neutron-common.templates:6001 diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot index 44c5cdcb5..6f5862f23 100644 --- a/trusty/debian/po/templates.pot +++ b/trusty/debian/po/templates.pot @@ -97,12 +97,6 @@ msgstr "" msgid "Nicira" msgstr "" -#. Type: select -#. Choices -#: ../neutron-common.templates:6001 -msgid "Midonet" -msgstr "" - #. Type: select #. Choices #: ../neutron-common.templates:6001 -- 2.45.2