Previously, ovs-vsctl would wait for ever if ovsdb-server
was not running. In such a situation, it made sense to use
a "--timeout" value to prevent a stuck startup script. But now,
ovs-vsctl by default returns an error if ovsdb-server is
not running. So, we no longer need the timeout option.
Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
rhel/etc_sysconfig_network-scripts_ifdown-ovs | 5 ++---
rhel/etc_sysconfig_network-scripts_ifup-ovs | 9 ++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/rhel/etc_sysconfig_network-scripts_ifdown-ovs
b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
index d2a2f4b..af5e05f 100755
--- a/rhel/etc_sysconfig_network-scripts_ifdown-ovs
+++ b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
@@ -22,7 +22,6 @@ cd /etc/sysconfig/network-scripts
[ -f ../network ] && . ../network
CONFIG=${1}
-TIMEOUT=10
source_config
@@ -40,12 +39,12 @@ case "$TYPE" in
OVSBridge)
${OTHERSCRIPT} ${CONFIG} $2
retval=$?
- ovs-vsctl -t ${TIMEOUT} -- --if-exists del-br "$DEVICE"
+ ovs-vsctl -- --if-exists del-br "$DEVICE"
;;
OVSPort|OVSIntPort|OVSBond)
${OTHERSCRIPT} ${CONFIG} $2
retval=$?
- ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE"
"$DEVICE"
+ ovs-vsctl -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE"
;;
*)
echo $"Invalid OVS interface type $TYPE"
diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs
b/rhel/etc_sysconfig_network-scripts_ifup-ovs
index 8904c59..c7c3516 100755
--- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
+++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
@@ -22,7 +22,6 @@ cd /etc/sysconfig/network-scripts
[ -f ../network ] && . ../network
CONFIG=${1}
-TIMEOUT=10
need_config ${CONFIG}
@@ -69,7 +68,7 @@ case "$TYPE" in
# it does not exist, create it. It is possible for a bridge to
exist
# because it remained in the OVSDB for some reason, but it
won't be up.
if check_device_down "${DEVICE}"; then
- ovs-vsctl -t ${TIMEOUT} -- --may-exist add-br "$DEVICE"
$OVS_OPTIONS \
+ ovs-vsctl -- --may-exist add-br "$DEVICE" $OVS_OPTIONS \
${OVS_EXTRA+-- $OVS_EXTRA} \
${STP+-- set bridge "$DEVICE" stp_enable="${STP}"}
else
@@ -100,12 +99,12 @@ case "$TYPE" in
OVSPort)
ifup_ovs_bridge
${OTHERSCRIPT} ${CONFIG} ${2}
- ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE"
"$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+ ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE"
$OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
;;
OVSIntPort)
ifup_ovs_bridge
- ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE"
"$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=internal ${OVS_EXTRA+--
$OVS_EXTRA}
+ ovs-vsctl -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE"
$OVS_OPTIONS -- set Interface "$DEVICE" type=internal ${OVS_EXTRA+-- $OVS_EXTRA}
${OTHERSCRIPT} ${CONFIG} ${2}
;;
OVSBond)
@@ -113,7 +112,7 @@ case "$TYPE" in
for _iface in $BOND_IFACES; do
/sbin/ifup ${_iface}
done
- ovs-vsctl -t ${TIMEOUT} -- --fake-iface add-bond "$OVS_BRIDGE"
"$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+ ovs-vsctl -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE"
${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
${OTHERSCRIPT} ${CONFIG} ${2}
OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
;;
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
