From: Thomas Goirand Date: Fri, 1 Jul 2016 18:44:45 +0000 (+0200) Subject: Refresh the core_plugin selection logic so it's up-to-date. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0c64f0894d3fa2237630fcf1b5bda6ca9010d8a1;p=openstack-build%2Fneutron-build.git Refresh the core_plugin selection logic so it's up-to-date. Rewritten-From: 24608d6d46945add8233df48fa3cb9f7112d94c3 --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 0533fdaf4..903415d90 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -2,8 +2,9 @@ neutron (2:9.0.0~b1-2) UNRELEASED; urgency=medium * 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. - -- Thomas Goirand Fri, 17 Jun 2016 14:33:59 +0200 + -- Thomas Goirand Fri, 01 Jul 2016 20:42:55 +0200 neutron (2:9.0.0~b1-1) experimental; urgency=medium diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in index fce8879c1..343a6003f 100644 --- a/xenial/debian/neutron-common.config.in +++ b/xenial/debian/neutron-common.config.in @@ -9,53 +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 - ;; - *) - 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/plugin_guess_func b/xenial/debian/plugin_guess_func index 1dfa5244d..28f969289 100644 --- a/xenial/debian/plugin_guess_func +++ b/xenial/debian/plugin_guess_func @@ -6,47 +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 + "networking_plumgrid.neutron.plugins.plugin:NeutronPluginPLUMgridV2"|"plumgrid") + NEUTRON_PLUGIN_NAME=plumgrid ;; - "neutron.plugins.bigswitch.plugin.NeutronRestProxyV2") - NEUTRON_PLUGIN_NAME=BigSwitch + "midonet.neutron.plugin_v1:MidonetPluginV2"|"midonet") + NEUTRON_PLUGIN_NAME=midonet ;; - "neutron.plugins.cisco.network_plugin.PluginV2") - NEUTRON_PLUGIN_NAME=Cisco + "midonet.neutron.plugin_v2:MidonetPluginV2"|"midonet_v2") + NEUTRON_PLUGIN_NAME=midonet_v2 ;; - "neutron.plugins.nicira.NeutronPlugin.NvpPluginV2") - NEUTRON_PLUGIN_NAME=neutron.plugins.nicira.NeutronPlugin.NvpPluginV2 + "networking_nec.nwa.l2.plugin:NECNWAL2Plugin"|"necnwa") + NEUTRON_PLUGIN_NAME=nec ;; - "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:NsxMhPlugin"|"vmware") + NEUTRON_PLUGIN_NAME=vmware ;; *) NEUTRON_PLUGIN_NAME="other" @@ -58,101 +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}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 - ;; - *) - NEUTRON_PLUGIN_NAME="other" - ;; - esac -}