Somehow I lost track of this thread and forgot to push, but it's out there now.
On Wed, May 11, 2011 at 07:43:02PM -0700, Justin Pettit wrote: > Sounds good. Thanks for handling this. > > --Justin > > > On May 11, 2011, at 12:40 PM, Ben Pfaff wrote: > > > So, should I add commit f8d17df2b2600d00267d7fcea1f34615c3f3ef50 > > "xenserver: Fix bugs related to using xe-switch-network-backend in > > spec file." to the end of this series and push it to branch-1.1, then? > > > > On Tue, May 10, 2011 at 11:13:07AM -0700, Ben Pfaff wrote: > >> OK, thanks for the info. > >> > >> On Tue, May 10, 2011 at 11:12:05AM -0700, Justin Pettit wrote: > >>> This patch is not fully baked. I'm testing a fix now that would need > >>> to be applied on top of it. > >>> > >>> --Justin > >>> > >>> > >>> On May 10, 2011, at 11:08 AM, Ben Pfaff <[email protected]> wrote: > >>> > >>>> From: Justin Pettit <[email protected]> > >>>> > >>>> 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. > >>>> --- > >>>> xenserver/openvswitch-xen.spec | 14 ++------------ > >>>> 1 files changed, 2 insertions(+), 12 deletions(-) > >>>> > >>>> diff --git a/xenserver/openvswitch-xen.spec > >>>> b/xenserver/openvswitch-xen.spec > >>>> index 97bf99c..de702ad 100644 > >>>> --- a/xenserver/openvswitch-xen.spec > >>>> +++ b/xenserver/openvswitch-xen.spec > >>>> @@ -226,12 +226,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) > >>>> @@ -310,12 +305,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 > >>>> -- > >>>> 1.7.4.4 > >>>> > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
