← Back to branch summary

~ubuntu-branches/ubuntu/wily/openvswitch/wily

« back to all changes in this revision

Viewing changes to rhel/etc_sysconfig_network-scripts_ifup-ovs

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-08-10 11:35:15 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20150810113515-575vj06oq29emxsn
Tags: 2.4.0~git20150810.97bab95-0ubuntu1
* New upstream snapshot from 2.4 branch:
  - d/*: Align any relevant packaging changes with upstream.
* d/*: wrap-and-sort.
* d/openvswitch-{common,vswitch}.install: Correct install location for
  bash completion files.
* d/tests/openflow.py: Explicitly use ovs-testcontroller as provided
  by 2.4.0 release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
rhel/etc_sysconfig_network-scripts_ifup-ovs
117
117
        OVSPort)
118
118
                ifup_ovs_bridge
119
119
                ${OTHERSCRIPT} ${CONFIG} ${2}
120
 
                ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
 
120
                # The port might be already in the database but not yet
 
121
                # in the datapath.  So, remove the stale interface first.
 
122
                ovs-vsctl -t ${TIMEOUT} \
 
123
                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
 
124
                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
121
125
                OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
122
126
                ;;
123
127
        OVSIntPort)
135
139
                for _iface in $BOND_IFACES; do
136
140
                        /sbin/ifup ${_iface}
137
141
                done
138
 
                ovs-vsctl -t ${TIMEOUT} -- --fake-iface add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
139
 
                ${OTHERSCRIPT} ${CONFIG} ${2}
 
142
                ovs-vsctl -t ${TIMEOUT} -- --may-exist add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
140
143
                OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
141
144
                ;;
142
145
        OVSTunnel)