Added support for ml2.

Rewritten-From: 0ce3d7ab5ea2f14a04f4d7d625d1aa67b3594775

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index b3138b25688e2d08b317e0385f65188f0df319b2..2aaec8f4926631e011714b213305535a2c744c5f 100644 (file)
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/debian/neutron-common.config.in
@@ -16,6 +16,9 @@ neutron_core_plugin_to_plugin_name () {
        "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
        ;;

diff --git a/trusty/debian/neutron-common.templates b/trusty/debian/neutron-common.templates
index 1c9794cd905b27fcf10cfcd3892ca28d4055facd..e32ff245c37b15dc427d7cc33bdafeefd135cbbb 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, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
-Choices-C: OpenVSwitch, LinuxBridge, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
+__Choices: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
+Choices-C: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
 Default: OpenVSwitch
 _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 acd8e282ec92ed2bb405410fe7487a5085dfe22b..35bc6c5c2dfa6b9715be83f4687f35aaec48403d 100644 (file)
--- a/trusty/debian/plugin_guess_func
+++ b/trusty/debian/plugin_guess_func
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Remember to also add any new plugin name into neutron-common.templates
+
 # Please remember this function is also duplicated in debian/neutron-common.config.in
 ### Guess the plugin name depending on the class of the plugin in /etc/neutron/neutron.conf ###
 neutron_core_plugin_to_plugin_name () {
@@ -10,6 +12,9 @@ neutron_core_plugin_to_plugin_name () {
        "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
        ;;
@@ -59,6 +64,9 @@ neutron_plugin_ini_path () {
        "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
        ;;
@@ -107,6 +115,9 @@ neutron_core_plugin_to_plugin_name () {
        "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
        ;;