Update references to Nicira NVP plugin

Reference to Nicira NVP plugin need to be updated as VMware NSX plugin
according to changes in Neutron

Change-Id: I0b8f5934b31a2131ac6f8d91008227f664ef6d85
Closes-bug: #1515165

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 834f836270cee68012333568ff963e18d85c26a3..633d5f892eb07b7b4013eb82077b86be5ac9ad48 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+neutron (2:7.0.0-1~u14.04+mos3) mos8.0; urgency=medium
+
+  * Update references to Nicira NVP plugin
+    LP: #1515165
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Wed, 09 Dec 2015 13:08:42 +0300
+
 neutron (2:7.0.0-1~u14.04+mos2) mos8.0; urgency=medium
 
   * Add radvd to l3-agent dependencies as it's required for IPv6 networking

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index ad6da5f9981c679043b3ab275bb1cb5b419c75ce..c890d4eda32250bc22817ebbd5106224499c9fa6 100644 (file)
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/debian/neutron-common.config.in
@@ -52,6 +52,9 @@ neutron_core_plugin_to_plugin_name () {
        "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin")
                NEUTRON_PLUGIN_NAME=Mellanox
        ;;
+       "vmware_nsx.plugin.NsxVPlugin")
+               NEUTRON_PLUGIN_NAME=VMware
+       ;;
        *)
                NEUTRON_PLUGIN_NAME="other"
        ;;

diff --git a/trusty/debian/plugin_guess_func b/trusty/debian/plugin_guess_func
index 1dfa5244deadd6584020b4561b2914910e6ead91..281152abbbd4d25ca8f771fd67688d355ea08cde 100644 (file)
--- a/trusty/debian/plugin_guess_func
+++ b/trusty/debian/plugin_guess_func
@@ -48,6 +48,9 @@ neutron_core_plugin_to_plugin_name () {
        "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin")
                NEUTRON_PLUGIN_NAME=Mellanox
        ;;
+       "vmware_nsx.plugin.NsxVPlugin")
+               NEUTRON_PLUGIN_NAME=VMware
+       ;;
        *)
                NEUTRON_PLUGIN_NAME="other"
        ;;
@@ -100,6 +103,9 @@ neutron_plugin_ini_path () {
        "Mellanox")
                NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}mlnx/mlnx_conf.ini
        ;;
+       "VMware")
+               NEUTRON_PLUGIN_CONFIG=${PLUG_INI_BASE}vmware/nsx.ini
+       ;;
        *)
                NEUTRON_PLUGIN_CONFIG=""
        ;;
@@ -151,6 +157,9 @@ neutron_core_plugin_to_plugin_name () {
        "neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin")
                NEUTRON_PLUGIN_NAME=Mellanox
        ;;
+       "vmware_nsx.plugin.NsxVPlugin")
+               NEUTRON_PLUGIN_NAME=VMware
+       ;;
        *)
                NEUTRON_PLUGIN_NAME="other"
        ;;