Browse code
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
Huan Xie authored on 2016/12/01 12:47:24Showing 1 changed files
| ... | ... |
@@ -97,8 +97,8 @@ function neutron_plugin_configure_plugin_agent {
|
| 97 | 97 |
|
| 98 | 98 |
# Set OVS native interface for ovs-agent in compute node |
| 99 | 99 |
XEN_DOM0_IP=$(echo "$XENAPI_CONNECTION_URL" | cut -d "/" -f 3) |
| 100 |
- iniset /$Q_PLUGIN_CONF_FILE ovs ovsdb_connection tcp:$XEN_DOM0_IP:6640 |
|
| 101 |
- iniset /$Q_PLUGIN_CONF_FILE ovs of_listen_address $HOST_IP |
|
| 100 |
+ iniset /$Q_PLUGIN_CONF_FILE.domU ovs ovsdb_connection tcp:$XEN_DOM0_IP:6640 |
|
| 101 |
+ iniset /$Q_PLUGIN_CONF_FILE.domU ovs of_listen_address $HOST_IP |
|
| 102 | 102 |
|
| 103 | 103 |
# Set up domU's L2 agent: |
| 104 | 104 |
|