From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-8875-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 9453 invoked by alias); 24 Aug 2008 18:28:00 -0000
Received: (qmail 9445 invoked by alias); 24 Aug 2008 18:28:00 -0000
X-Spam-Status: No, hits=-1.1 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: RHEL5 - vm.sh: add parameter for xen migration mapping
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: cluster.git
X-Git-Refname: refs/heads/RHEL5
X-Git-Reftype: branch
X-Git-Oldrev: 40e34ea406411c10a53aa1a147a0c94a62c3d12b
X-Git-Newrev: 481eda3eba49e4066c3314c04fdf98b32ccb131e
From: "Ryan O'Hara" <rohara@fedoraproject.org>
Message-Id: <20080824182650.D0EF312030E@lists.fedorahosted.org>
Date: Mon, 25 Aug 2008 15:41: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: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2008-q3/txt/msg00305.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=481eda3eba49e4066c3314c04fdf98b32ccb131e
Commit:        481eda3eba49e4066c3314c04fdf98b32ccb131e
Parent:        40e34ea406411c10a53aa1a147a0c94a62c3d12b
Author:        rohara <rohara@spartan.(none)>
AuthorDate:    Sun Aug 24 13:26:26 2008 -0500
Committer:     rohara <rohara@spartan.(none)>
CommitterDate: Sun Aug 24 13:26:26 2008 -0500

vm.sh: add parameter for xen migration mapping

Provide method for mapping cluster node name to xen migration
target hostname. (BZ #453429)
---
 rgmanager/src/resources/vm.sh |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 3069f47..9c09d3f 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -134,6 +134,16 @@ meta_data()
             <content type="integer"/>
         </parameter>
 
+	<parameter name="migration_mapping">
+	    <longdesc lang="en">
+		Mapping of the hostname of a target member to a different hostname
+	    </longdesc>
+	    <shortdesc lang="en">
+		memberhost:targethost,memberhost:targethost ..
+	    </shortdesc>
+	    <content type="string"/>
+	</parameter>
+
 	<parameter name="bootloader">
 	    <longdesc lang="en">
 		Boot loader that can start the VM from physical image
@@ -474,7 +484,13 @@ migrate()
 	if [ "$OCF_RESKEY_migrate" = "live" ]; then
 		migrate_opt="-l"
 	fi
-	
+
+	# Patch from Marcelo Azevedo to migrate over private
+	# LANs instead of public LANs
+	if [ -n $OCF_RESKEY_migration_mapping ]; then
+		target=${OCF_RESKEY_migration_mapping#*$target:} target=${target%%,*}
+	fi
+
 	err=$(xm migrate $migrate_opt $OCF_RESKEY_name $target 2>&1 | head -1)
 	rv=$?