Skip to content

Commit db3eff7

Browse files
committed
Stop setting [ovs_vif_ovs] ovsdb_interface
The option was already deprecated in os-vif 2.2.0[1]. The override is no longer required since bug 1929446 was already resolved. [1] https://review.opendev.org/c/openstack/os-vif/+/744816 Related-Bug: #1929446 Change-Id: I5bc55723a178b32d947da2ac91d2f62aa8124990
1 parent 2795e82 commit db3eff7

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

lib/os-vif

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#!/bin/bash
22

3-
# support vsctl or native.
4-
# until bug #1929446 is resolved we override the os-vif default
5-
# and fall back to the legacy "vsctl" driver.
6-
OS_VIF_OVS_OVSDB_INTERFACE=${OS_VIF_OVS_OVSDB_INTERFACE:="vsctl"}
7-
83
function is_ml2_ovs {
94
if [[ "${Q_AGENT}" == "openvswitch" ]]; then
105
echo "True"
@@ -19,11 +14,9 @@ OS_VIF_OVS_ISOLATE_VIF=$(trueorfalse False OS_VIF_OVS_ISOLATE_VIF)
1914

2015
function configure_os_vif {
2116
if [[ -e ${NOVA_CONF} ]]; then
22-
iniset ${NOVA_CONF} os_vif_ovs ovsdb_interface ${OS_VIF_OVS_OVSDB_INTERFACE}
2317
iniset ${NOVA_CONF} os_vif_ovs isolate_vif ${OS_VIF_OVS_ISOLATE_VIF}
2418
fi
2519
if [[ -e ${NEUTRON_CONF} ]]; then
26-
iniset ${NEUTRON_CONF} os_vif_ovs ovsdb_interface ${OS_VIF_OVS_OVSDB_INTERFACE}
2720
iniset ${NEUTRON_CONF} os_vif_ovs isolate_vif ${OS_VIF_OVS_ISOLATE_VIF}
2821
fi
2922
}

0 commit comments

Comments
 (0)