# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1278595952 -3600
# Node ID fe4fe62f8fab7c7aa10e3507f10c4956938bfddc
# Parent 96f3ddc3dfac4fc2142f9d893090404939b8888a
[PATCH] interface-reconfigure+vif: accept openvswitch in
/etc/xensource/network.conf
>From aeb2b7a166ec1f7143bd75b01a65ba440cccd88a Mon Sep 17 00:00:00 2001
Date: Thu, 8 Apr 2010 15:00:21 +0100
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
scripts/vif | 9 +++++----
.../opt_xensource_libexec_InterfaceReconfigure.py | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff -r 96f3ddc3dfac -r fe4fe62f8fab scripts/InterfaceReconfigure.py
--- a/scripts/InterfaceReconfigure.py Thu Jul 08 14:32:31 2010 +0100
+++ b/scripts/InterfaceReconfigure.py Thu Jul 08 14:32:32 2010 +0100
@@ -863,7 +863,7 @@
if network_backend == "bridge":
from InterfaceReconfigureBridge import DatapathBridge
return DatapathBridge(pif)
- elif network_backend == "vswitch":
+ elif network_backend in ["openvswitch", "vswitch"]:
from InterfaceReconfigureVswitch import DatapathVswitch
return DatapathVswitch(pif)
else:
diff -r 96f3ddc3dfac -r fe4fe62f8fab scripts/vif
--- a/scripts/vif Thu Jul 08 14:32:31 2010 +0100
+++ b/scripts/vif Thu Jul 08 14:32:32 2010 +0100
@@ -46,7 +46,7 @@
*) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
esac
;;
- vswitch)
+ openvswitch)
logger -t script-vif "${dev}: Promiscuous ports are not
supported via Open vSwitch."
;;
esac
@@ -164,7 +164,7 @@
${BRCTL} setfd "${bridge}" 0 || logger -t
scripts-vif "Failed to brctl setfd ${bridge} 0"
${BRCTL} addif "${bridge}" "${dev}" || logger -t
scripts-vif "Failed to brctl addif ${bridge} ${dev}"
;;
- vswitch)
+ openvswitch)
if [ "$TYPE" = "vif" ] ; then
local vif_details=$(handle_vswitch_vif_details)
fi
@@ -182,7 +182,7 @@
bridge)
# Nothing to do
;;
- vswitch)
+ openvswitch)
# If ovs-brcompatd is running, it might already have deleted the
# port. Use --if-exists to suppress the error that would otherwise
# arise in that case.
@@ -202,7 +202,8 @@
fi
case $NETWORK_MODE in
- bridge|vswitch) ;;
+ bridge|openvswitch) ;;
+ vswitch) NETWORK_MODE=openvswitch ;;
*)
logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
exit 1
scripts/InterfaceReconfigure.py | 2 +-
scripts/vif | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
txt945XQzFJoM.txt
Description: Text Data
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home