X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rhel%2Fetc_sysconfig_network-scripts_ifup-ovs;h=8904c59b909fed25fd96a7e6e157f9b3a53f82f1;hb=4b570f12766f3c4eeb527de69d8eedfd59c34b86;hp=35387214b0e48847f4fccd5c69df9fb7157c24af;hpb=3214851c31538e8690e31f95702f8927a8c0838b;p=sliver-openvswitch.git

diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs
index 35387214b..8904c59b9 100755
--- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
+++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
@@ -34,7 +34,7 @@ if [ ! -x ${OTHERSCRIPT} ]; then
 	OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-eth"
 fi
 
-check_recursion()
+check_recursion ()
 {
 	[ -n "${UPPEDSTACK}" ] && for _r in ${UPPEDSTACK}; do
 		[ "$_r" = "$1" ] && return 1
@@ -43,6 +43,13 @@ check_recursion()
 	return 0
 }
 
+ifup_ovs_bridge ()
+{
+	if ovs-vsctl br-exists "${OVS_BRIDGE}"; then :; else
+		/sbin/ifup "${OVS_BRIDGE}"
+	fi
+}
+
 if [ -z "${UPPEDSTACK}" ]; then
 	UPPEDSTACK="${DEVICE}"
 fi
@@ -57,7 +64,23 @@ done
 
 case "$TYPE" in
 	OVSBridge)
-		ovs-vsctl -t ${TIMEOUT} -- --may-exist add-br "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+		# If bridge already exists and is up, it has been configured through
+		# other cases like OVSPort, OVSIntPort and OVSBond. If it is down or
+		# 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_EXTRA+-- $OVS_EXTRA} \
+			${STP+-- set bridge "$DEVICE" stp_enable="${STP}"}
+		else
+			OVSBRIDGECONFIGURED="yes"
+		fi
+
+		# When dhcp is enabled, the assumption is that there will be a port to
+		# attach (otherwise, we can't reach out for dhcp). So, we do not
+		# configure the bridge through rhel's ifup infrastructure unless
+		# it is being configured after the port has been configured.
+		# The "OVSINTF" is set only after the port is configured.
 		if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
 			case " ${OVSDHCPINTERFACES} " in
 				*" ${OVSINTF} "*)
@@ -65,24 +88,28 @@ case "$TYPE" in
 				;;
 			esac
 		fi
-		if [ "${OVSBOOTPROTO}" != "dhcp" ] && [ -z "${OVSINTF}" ]; then
+
+		# When dhcp is not enabled, it is possible that someone may want
+		# a standalone bridge (i.e it may not have any ports). Configure it.
+		if [ "${OVSBOOTPROTO}" != "dhcp" ] && [ -z "${OVSINTF}" ] && \
+			[ "${OVSBRIDGECONFIGURED}" != "yes" ]; then
 			${OTHERSCRIPT} ${CONFIG}
 		fi
-		[ -n "${STP}" ] && ovs-vsctl --no-wait set bridge "${DEVICE}" stp_enable="${STP}"
+		exit 0
 		;;
 	OVSPort)
-		/sbin/ifup "$OVS_BRIDGE"
+		ifup_ovs_bridge
 		${OTHERSCRIPT} ${CONFIG} ${2}
 		ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
 		OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
 		;;
 	OVSIntPort)
-		/sbin/ifup "$OVS_BRIDGE"
+		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}
 		${OTHERSCRIPT} ${CONFIG} ${2}
 		;;
 	OVSBond)
-		/sbin/ifup "$OVS_BRIDGE"
+		ifup_ovs_bridge
 		for _iface in $BOND_IFACES; do
 			/sbin/ifup ${_iface}
 		done