summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2011-04-26 19:58:19 -0700
committerBen Pfaff <blp@nicira.com>2011-05-23 09:18:31 -0700
commit471e49969982c9bf51ce6dbb9ad5ca14c3f13361 (patch)
treeeb99ca6bba2e9e605a1b0b10e7fd69f1e597d59a
parente534fe1bcf37ca9333356d422d9996ca12845302 (diff)
downloadopenvswitch-471e49969982c9bf51ce6dbb9ad5ca14c3f13361.tar.gz
xenserver: Use xe-switch-network-stack in RPM spec file.
The proper way to switch the networking back-end is to use the "xe-switch-network-stack" command rather than directly modifying "/etc/xensource/network.conf". Use that method in the spec file.
-rw-r--r--xenserver/openvswitch-xen.spec14
1 files changed, 2 insertions, 12 deletions
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index 19a96f907..6c030a45b 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -228,12 +228,7 @@ done
if [ "$1" = "1" ]; then # $1 = 2 for upgrade
# Configure system to use Open vSwitch
- echo vswitch > /etc/xensource/network.conf
-
- printf "\nYou MUST reboot the server NOW to complete the change to\n"
- printf "Open vSwitch. Attempts to modify networking on the server\n"
- printf "or any hosted VM will fail until after the reboot and could\n"
- printf "leave the server in a state requiring manual recovery.\n\n"
+ xe-switch-network-backend vswitch
else
mode=$(cat /etc/xensource/network.conf)
@@ -312,12 +307,7 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade
rmdir -p /usr/lib/openvswitch/xs-saved 2>/dev/null
# Configure system to use bridge
- echo bridge > /etc/xensource/network.conf
-
- printf "\nYou MUST reboot the server now to complete the change to\n"
- printf "standard Xen networking. Attempts to modify networking on the\n"
- printf "server or any hosted VM will fail until after the reboot and\n"
- printf "could leave the server in a state requiring manual recovery.\n\n"
+ xe-switch-network-backend bridge
fi
%files