x/xenapi-os-testing
Code Issues Proposed changes

Clean the temporary content added for converse config

Browse Source 
Change-Id: Ied096092276f6dce393359139b3fca0984d5649d
This commit is contained in:
Jianghua Wang 2016-12-06 11:36:24 +08:00
parent 618dc4ab85
commit fa8cb6528d
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
run_tests.sh
View File

@ -268,25 +268,6 @@ EOF
# Set local.conf for neutron ovs-agent in compute node
localconf="/opt/stack/new/devstack/local.conf"
# check if it's before reverse the role of q-agt and q-domuA.
# see: https://review.openstack.org/#/c/396573/
if grep 'iniset /$Q_PLUGIN_CONF_FILE agent root_helper_daemon ""' \
/opt/stack/new/devstack/lib/neutron_plugins/openvswitch_agent >/dev/null; then
# this can be removed once the above patch got merged.
cat <<EOF >>"$localconf"
[[local|localrc]]
[[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]]
[ovs]
ovsdb_interface = vsctl
of_interface = ovs-ofctl
[[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini.domU]]
[ovs]
bridge_mappings = physnet1:br-eth3,public:br-ex
EOF
else
cat <<EOF >>"$localconf"
[[local|localrc]]
@ -300,7 +281,6 @@ of_interface = ovs-ofctl
[ovs]
bridge_mappings = physnet1:br-eth3,public:br-ex
EOF
fi
fi
)