openstack/devstack
Code Issues Proposed changes

Merge "Stop setting [ovs_vif_ovs] ovsdb_interface"

Browse Source
This commit is contained in:
Zuul 2022-12-06 20:15:30 +00:00 committed by Gerrit Code Review
commit fd502fe052
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/os-vif
View File

@ -1,10 +1,5 @@
#!/bin/bash #!/bin/bash
# support vsctl or native.
# until bug #1929446 is resolved we override the os-vif default
# and fall back to the legacy "vsctl" driver.
OS_VIF_OVS_OVSDB_INTERFACE=${OS_VIF_OVS_OVSDB_INTERFACE:="vsctl"}
function is_ml2_ovs { function is_ml2_ovs {
if [[ "${Q_AGENT}" == "openvswitch" ]]; then if [[ "${Q_AGENT}" == "openvswitch" ]]; then
echo "True" echo "True"
@ -19,11 +14,9 @@ OS_VIF_OVS_ISOLATE_VIF=$(trueorfalse False OS_VIF_OVS_ISOLATE_VIF)
function configure_os_vif { function configure_os_vif {
if [[ -e ${NOVA_CONF} ]]; then if [[ -e ${NOVA_CONF} ]]; then
iniset ${NOVA_CONF} os_vif_ovs ovsdb_interface ${OS_VIF_OVS_OVSDB_INTERFACE}
iniset ${NOVA_CONF} os_vif_ovs isolate_vif ${OS_VIF_OVS_ISOLATE_VIF} iniset ${NOVA_CONF} os_vif_ovs isolate_vif ${OS_VIF_OVS_ISOLATE_VIF}
fi fi
if [[ -e ${NEUTRON_CONF} ]]; then if [[ -e ${NEUTRON_CONF} ]]; then
iniset ${NEUTRON_CONF} os_vif_ovs ovsdb_interface ${OS_VIF_OVS_OVSDB_INTERFACE}
iniset ${NEUTRON_CONF} os_vif_ovs isolate_vif ${OS_VIF_OVS_ISOLATE_VIF} iniset ${NEUTRON_CONF} os_vif_ovs isolate_vif ${OS_VIF_OVS_ISOLATE_VIF}
fi fi
} }