From df875c5f16980228e2443c50298f35063f2b54ae Mon Sep 17 00:00:00 2001 From: Huan Xie Date: Wed, 30 Nov 2016 19:47:24 -0800 Subject: [PATCH] Reconfig ml2 ovs configuration for neutron on XenServer XenServer already support OVS native mode and I have a patch for configuring it https://review.openstack.org/#/c/372952/ which is fine. But we have another patch which revert the usage of ml2_confi.ini and ml2_conf.ini.domU https://review.openstack.org/#/c/396573/. Both patches work well separately. But the two should have some dependent relationship. Once one merged, the other should change accordingly. Sorry that we missed the dependency. This patch is to fix the ovs config based on reverted ml2_conf.ini and ml2_conf.ini.domU to make sure we configure the correct IP for ovs agent Change-Id: Ib53e37e210cc849f161dd6630f81e5b2331a91d5 --- lib/neutron_plugins/openvswitch_agent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent index f009966a01..76a1a4f3a1 100644 --- a/lib/neutron_plugins/openvswitch_agent +++ b/lib/neutron_plugins/openvswitch_agent @@ -97,8 +97,8 @@ function neutron_plugin_configure_plugin_agent { # Set OVS native interface for ovs-agent in compute node XEN_DOM0_IP=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3) - iniset /$Q_PLUGIN_CONF_FILE ovs ovsdb_connection tcp:$XEN_DOM0_IP:6640 - iniset /$Q_PLUGIN_CONF_FILE ovs of_listen_address $HOST_IP + iniset /$Q_PLUGIN_CONF_FILE.domU ovs ovsdb_connection tcp:$XEN_DOM0_IP:6640 + iniset /$Q_PLUGIN_CONF_FILE.domU ovs of_listen_address $HOST_IP # Set up domU's L2 agent: