diff options
| author | Flavio Leitner <fbl@redhat.com> | 2014-11-06 16:50:06 -0200 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-11-06 14:14:33 -0800 |
| commit | 39ebb203f1b2a5c9dff47d33f3839a4ab8ed7373 (patch) | |
| tree | 1fc3fc7dd506fb0795e9609d739258f99fdd16ae | |
| parent | 390a6ec40c9d38e82870359bf44e0427da6b0025 (diff) | |
rhel: Fix tunnel port ifup/ifdown failure.
The tunnel port is invisible to the OS, so there is
no reason to call OTHERSCRIPT in the ifup/ifdown scripts.
Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
| -rwxr-xr-x | rhel/etc_sysconfig_network-scripts_ifdown-ovs | 4 | ||||
| -rwxr-xr-x | rhel/etc_sysconfig_network-scripts_ifup-ovs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/rhel/etc_sysconfig_network-scripts_ifdown-ovs b/rhel/etc_sysconfig_network-scripts_ifdown-ovs index 6e96d62a2..5f78f9ca7 100755 --- a/rhel/etc_sysconfig_network-scripts_ifdown-ovs +++ b/rhel/etc_sysconfig_network-scripts_ifdown-ovs @@ -51,12 +51,12 @@ case "$TYPE" in retval=$? ovs-vsctl -t ${TIMEOUT} -- --if-exists del-br "$DEVICE" ;; - OVSPort|OVSIntPort|OVSBond|OVSTunnel) + OVSPort|OVSIntPort|OVSBond) ${OTHERSCRIPT} ${CONFIG} $2 retval=$? ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" ;; - OVSPatchPort) + OVSPatchPort|OVSTunnel) ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" ;; *) diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs index ffebb20b0..69f51a235 100755 --- a/rhel/etc_sysconfig_network-scripts_ifup-ovs +++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs @@ -142,7 +142,6 @@ case "$TYPE" in OVSTunnel) ifup_ovs_bridge ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=$OVS_TUNNEL_TYPE $OVS_TUNNEL_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA} - ${OTHERSCRIPT} ${CONFIG} ${2} ;; OVSPatchPort) ifup_ovs_bridge |