[ovs-discuss] [PATCH] xenserver: Do not set or remove vSwitchVersion xapi parameter anymore.

[Justin Pettit]

Looks good to me.

--Justin


On Jul 28, 2009, at 3:36 PM, Ben Pfaff wrote:

> The other-config:vSwitchVersion parameter was used to announce the  
> Open
> vSwitch version installed on a XenServer host, but this had the  
> problem
> that it could not be read or updated if the connection to the pool  
> master
> was down.  Because of this problem, the only user of this parameter in
> Open vSwitch was removed (in commit 3cdc31a4c3a "xenserver: Retrieve
> vSwitch version from binary in xsconsole").  So this commit finished  
> the
> process and removes the parameter entirely.
>
> This should fix hangs on Open vSwitch installation and removal due to
> waiting on the connection to the pool master.
> ---
> xenserver/vswitch-xen.spec |   18 ------------------
> 1 files changed, 0 insertions(+), 18 deletions(-)
>
> diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
> index 95a7bff..753e97e 100644
> --- a/xenserver/vswitch-xen.spec
> +++ b/xenserver/vswitch-xen.spec
> @@ -165,8 +165,6 @@ EOF
> fi
>
> %post
> -source /etc/xensource-inventory
> -
> if grep -F net.ipv4.conf.all.arp_filter >/dev/null 2>&1; then :; else
>     cat >>/etc/sysctl.conf <<EOF
> # This is a workaround for a bug in xhad, which binds to a particular
> @@ -182,10 +180,6 @@ net.ipv4.conf.all.arp_filter = 1
> EOF
> fi
>
> -xe host-param-set \
> -    "other-config:vSwitchVersion=%{version}"  
> uuid="$INSTALLATION_UUID" ||
> -    echo "Could not set vSwitchVersion config parameter"
> -
> # Ensure ovs-vswitchd.conf exists
> touch /etc/ovs-vswitchd.conf
>
> @@ -273,18 +267,6 @@ if [ "$1" = "0" ]; then     # $1 = 1 for upgrade
>     rm -f /var/log/vswitch*
>     rm -f /etc/ovs-vswitchd.cacert
>
> -    if [ ! -f /etc/xensource-inventory ]; then
> -        printf "XenSource inventory not present in /etc/xensource- 
> inventory\n"
> -        printf "Could not remove vSwitchVersion from XAPI database. 
> \n"
> -        exit 1
> -    else
> -        source /etc/xensource-inventory
> -        xe host-param-remove \
> -            param-name=other-config param-key=vSwitchVersion \
> -            uuid="$INSTALLATION_UUID" ||
> -            echo "Could not clear vSwitchVersion config parameter."
> -    fi
> -
>     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"
> -- 
> 1.6.3.3
>
>
> _______________________________________________
> discuss mailing list
> discuss at openvswitch.org
> http://openvswitch.org/mailman/listinfo/discuss_openvswitch.org