cluster: RHEL56 - Revert "resource-agents: Fix migrateuriopt setting"

Lon Hohberger lon at fedoraproject.org
Tue Dec 7 15:39:56 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c80b1f7e9a8152f4a9c6fb187b8d22fe69311b38
Commit:        c80b1f7e9a8152f4a9c6fb187b8d22fe69311b38
Parent:        648055167f28418094f5ce7f6ebe304af1444fef
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Dec 7 10:35:32 2010 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Dec 7 10:37:37 2010 -0500

Revert "resource-agents: Fix migrateuriopt setting"

This reverts commit 648055167f28418094f5ce7f6ebe304af1444fef.

Was missing bugzilla # in changelog.
---
 rgmanager/src/resources/vm.sh |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 7310da3..a7a458b 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -812,6 +812,7 @@ validate_all()
 		# Virsh makes it easier to do this.  Really.
 		if [ "$OCF_RESKEY_hypervisor" = "qemu" ]; then
 			export OCF_RESKEY_migration_uri="qemu+ssh://%s/system"
+			export migrateuriopt="tcp:%s"
 		fi
 
 		# I just need to believe in it more.
@@ -827,10 +828,6 @@ validate_all()
 		return $OCF_ERR_ARGS
 	fi
 
-	if [ "$OCF_RESKEY_hypervisor" = "qemu" ]; then
-		export migrateuriopt="tcp:%s"
-	fi
-
 	#virsh list --all | awk '{print $2}' | grep -q "^$OCF_RESKEY_name\$"
 	return $?
 }


More information about the cluster-commits mailing list