From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9144 invoked by alias); 29 Sep 2008 14:16:38 -0000 Received: (qmail 9138 invoked by alias); 29 Sep 2008 14:16:38 -0000 X-Spam-Status: No, hits=-0.2 required=5.0 tests=AWL,BAYES_50,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - cman: allow custom xen network bridge scripts To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 284cb96438161131457da42e56ecb3ffa08d06ed X-Git-Newrev: 1b4bd5be033b91ed355e2ca47e3811c89a518010 From: "Ryan O'Hara" Message-Id: <20080929141524.02BCE120468@lists.fedorahosted.org> Date: Mon, 29 Sep 2008 14:16:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00551.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1b4bd5be033b91ed355e2ca47e3811c89a518010 Commit: 1b4bd5be033b91ed355e2ca47e3811c89a518010 Parent: 284cb96438161131457da42e56ecb3ffa08d06ed Author: Ryan O'Hara AuthorDate: Fri Aug 29 10:07:38 2008 -0500 Committer: Ryan O'Hara CommitterDate: Mon Sep 29 09:14:16 2008 -0500 cman: allow custom xen network bridge scripts This patch allows users to define custom scripts for Xen network bridging. Previously, the name of the Xen network bridge was hard-coded in the cman init script. Users that wish to use custom Xen network bridge script should define NETWORK_BRIDGE_SCRIPT in /etc/sysconfig/cman. This script must exist in the /etc/xen/scripts directory. Users must also update the /etc/xen/xend-config.sxp file accordingly. --- cman/init.d/cman | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cman/init.d/cman b/cman/init.d/cman index d375acc..f500937 100644 --- a/cman/init.d/cman +++ b/cman/init.d/cman @@ -71,6 +71,11 @@ # to join the fence domain (equivalent to "yes"). [ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes" +# NETWORK_BRIDGE_SCRIPT -- script to use for xen network bridging. +# This script must exist in the /etc/xen/scripts directory. +# The default script is "network-bridge". +[ -z "$NETWORK_BRIDGE_SCRIPT" ] && NETWORK_BRIDGE_SCRIPT="network-bridge" + [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/cman" [ -n "$CLUSTERNAME" ] && cman_join_opts="-c $CLUSTERNAME" @@ -278,7 +283,7 @@ xend_bridged_net_enabled() { return 1 fi - egrep "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp >&/dev/null + egrep "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*${NETWORK_BRIDGE_SCRIPT}([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp >&/dev/null if [ $? -ne 0 ]; then # xend isn't configured to use bridged networking. return 1 @@ -287,8 +292,8 @@ xend_bridged_net_enabled() { } xend_bridged_net_start() { - if [ ! -x /etc/xen/scripts/network-bridge ]; then - if [ -f /etc/xen/scripts/network-bridge ]; then + if [ ! -x /etc/xen/scripts/${NETWORK_BRIDGE_SCRIPT} ]; then + if [ -f /etc/xen/scripts/${NETWORK_BRIDGE_SCRIPT} ]; then errmsg='The xend bridged network script cannot be run' else errmsg='The xend bridged network script is missing' @@ -298,8 +303,8 @@ xend_bridged_net_start() { /sbin/modprobe netbk >& /dev/null /sbin/modprobe netloop >& /dev/null - bridge_parms=`egrep -m 1 "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp| sed -r "s/^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+'?[[:blank:]]*network-bridge[[:blank:]]*//; s/'?[[:blank:]]*\).*//"` - errmsg=$(/etc/xen/scripts/network-bridge start $bridge_parms 2>&1) || return 1 + bridge_parms=`egrep -m 1 "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*${NETWORK_BRIDGE_SCRIPT}([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp| sed -r "s/^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+'?[[:blank:]]*${NETWORK_BRIDGE_SCRIPT}[[:blank:]]*//; s/'?[[:blank:]]*\).*//"` + errmsg=$(/etc/xen/scripts/${NETWORK_BRIDGE_SCRIPT} start $bridge_parms 2>&1) || return 1 return 0 }