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

diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec
index b1f45767e56715081c5d63dae2b921a75ffe368c..5b8b7c7424e863983078da8f4b2445fd00530786 100644 (file)
--- 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 <skolekonov@mirantis.com> 1:7.0.4-3%{?dist}~mos8.0.1
+- Remove the rest of MidoNet plugin from neutron
 * Thu Jun 16 2016 Sergey Kolekonov <skolekonov@mirantis.com> 1:7.0.4-2%{?dist}~mos8.0.1
 - Bump version according to the latest tag
 * Fri Dec 18 2015 Sergey Kolekonov <skolekonov@mirantis.com> 1:7.0.1-1%{?dist}~mos8.0.1

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index f72c700e3d3a4ce616f40fd605463d3ba2e3fb53..412e3f3c560c1805f98e80f69696cfe4a787de5a 100644 (file)
--- 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 975a8609ccd6200101ea3054717ae1707375a776..38b1a9da5b4d56745163dfad23525c50982a36d6 100644 (file)
--- 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 <skolekonov@mirantis.com>  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 b426d96b38e3cbfd4510adde0c7a25e137e1647b..020dec0b6054450122c65da479599ee4e0ffebbf 100644 (file)
--- 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 c890d4eda32250bc22817ebbd5106224499c9fa6..7596a7dd5b6b223cfc2223aa409e46d782c39c68 100644 (file)
--- 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 7b813dc3bce4a8153d5a482fe29ac06482a963e9..fff05638fcb3f301f5a8526edc79c235f0885599 100644 (file)
--- 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 d70480bdf2f6ce4fe935b494672919aab1efeb59..4f9c75136709dccc39f63d57d557f921cb261d4a 100644 (file)
--- 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 281152abbbd4d25ca8f771fd67688d355ea08cde..6ffd36c16ea0e963b3b32b2692112eb6bbba79d7 100644 (file)
--- 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 49236ced8de79bc998fd3b043adefb9adc8b00d1..699d1ed4ea7721ec0570414f6eb0cc4588fab855 100644 (file)
--- 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 71805b8776346c86bad26710030091cec708e92c..67068f59656911e4534c92221781cd84340abb66 100644 (file)
--- 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 ffd2d3b0ba5ac954e0cebd1a05cb3661f7bb7d02..0558c1f8cd6119b8145a2014726a414f15017a17 100644 (file)
--- 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 b5cf51d5b51843e68668d836c4baf86d38c23878..ac1e5f04c8163e273ad398132ee0ad71ff8a2d6b 100644 (file)
--- 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 3c594e943ccf42b03202bbaa31a57306ef3c846a..6c662179f1fd27031d353d13b7c7ac3c943e30af 100644 (file)
--- 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 00b1dcb37eb1059b5776c18c0ccd36611898e956..5c13ab0c0381d41953f9ad72b8d13388db8201c5 100644 (file)
--- 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 8ea2f587aab16429983c317a9b0cdc88a819297e..b4c80868314621cfd589170ff2ceac75873c05c6 100644 (file)
--- 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 13c6262210cae85f0c4f65f03136e11458634d1d..d01deed50f7c4837cfa4a0f7ca82d916df699ddc 100644 (file)
--- 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 4325e4271ab79fc8f3ce14e08d005f3fd9b365c8..e9d139d4dbdd2ad3a92cc07e3942989fb52ff104 100644 (file)
--- 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 44c5cdcb59657876f60dbc6b7fa9dbf61461cc1b..6f5862f23cde441657f9890c4330fa1aad4858c0 100644 (file)
--- 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