From c1605550d94736f5698d3f6ea7bc1e0b0914cb4e Mon Sep 17 00:00:00 2001 From: Michal Ptacek Date: Wed, 23 Sep 2015 21:02:02 +0100 Subject: [PATCH] Propagate OVS_DATAPATH_TYPE to ml2_conf.ini If OVS_DATAPATH_TYPE is configured it should be visible in ML2 config Changing OVS_DATAPATH_TYPE default value to 'system' from '' Closes-Bug: 1499029 Change-Id: I88e7d2554e8a1d6dcfea71fc1fb8e9fb2491d8b7 --- lib/neutron_plugins/openvswitch_agent | 1 + lib/neutron_plugins/ovs_base | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent index 1ff3a40c82..48e47b3dab 100755 --- a/lib/neutron_plugins/openvswitch_agent +++ b/lib/neutron_plugins/openvswitch_agent @@ -105,6 +105,7 @@ function neutron_plugin_configure_plugin_agent { iniset "/$Q_PLUGIN_CONF_FILE.domU" agent root_helper "$Q_RR_COMMAND" fi iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES + iniset /$Q_PLUGIN_CONF_FILE ovs datapath_type $OVS_DATAPATH_TYPE } function neutron_plugin_setup_interface_driver { diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base index f1f7f8597b..b012683a6f 100755 --- a/lib/neutron_plugins/ovs_base +++ b/lib/neutron_plugins/ovs_base @@ -8,7 +8,8 @@ OVSB_XTRACE=$(set +o | grep xtrace) set +o xtrace OVS_BRIDGE=${OVS_BRIDGE:-br-int} -OVS_DATAPATH_TYPE=${OVS_DATAPATH_TYPE:-""} +# OVS recognize default 'system' datapath or 'netdev' for userspace datapath +OVS_DATAPATH_TYPE=${OVS_DATAPATH_TYPE:-system} OVS_TUNNEL_BRIDGE=${OVS_TUNNEL_BRIDGE:-br-tun} function is_neutron_ovs_base_plugin { @@ -20,7 +21,7 @@ function _neutron_ovs_base_add_bridge { local bridge=$1 local addbr_cmd="sudo ovs-vsctl --no-wait -- --may-exist add-br $bridge" - if [ "$OVS_DATAPATH_TYPE" != "" ] ; then + if [ "$OVS_DATAPATH_TYPE" != "system" ] ; then addbr_cmd="$addbr_cmd -- set Bridge $bridge datapath_type=${OVS_DATAPATH_TYPE}" fi