[Cluster-devel] [PATCH] resource-agents: Fix migrateuriopt setting

[Cluster-devel] [PATCH] resource-agents: Fix migrateuriopt setting

[Lon Hohberger]

When a user was specifically setting migration_uri (for example,
to get around ssh banners causing migration to fail),
vm.sh was leaving the migrateuriopt variable unset when using
QEMU/KVM.  This caused the printf() during command line generation
to be incorrect.

This means the generated command line looked like this:

	virsh migrate --live vm1 \
 	   qemu+ssh://node1.example.com/system?command=/bin/quiet_ssh.sh
	   node1.example.com

Instead of:

	virsh migrate --live vm1 \
 	   qemu+ssh://node1.example.com/system?command=/bin/quiet_ssh.sh
	   tcp:node1.example.com
	   ^^^^

Resolves: rhbz#659477

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/resources/vm.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index e23d5ba..22f29f1 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -810,7 +810,6 @@ 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.
@@ -826,6 +825,10 @@ 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 $?
 }
-- 
1.7.2.3

[Cluster-devel] [PATCH] resource-agents: Fix migrateuriopt setting

[Ryan O'Hara]

ACK.

On Mon, Dec 06, 2010 at 10:23:27AM -0500, Lon Hohberger wrote:
> When a user was specifically setting migration_uri (for example,
> to get around ssh banners causing migration to fail),
> vm.sh was leaving the migrateuriopt variable unset when using
> QEMU/KVM.  This caused the printf() during command line generation
> to be incorrect.
> 
> This means the generated command line looked like this:
> 
> 	virsh migrate --live vm1 \
>  	   qemu+ssh://node1.example.com/system?command=/bin/quiet_ssh.sh
> 	   node1.example.com
> 
> Instead of:
> 
> 	virsh migrate --live vm1 \
>  	   qemu+ssh://node1.example.com/system?command=/bin/quiet_ssh.sh
> 	   tcp:node1.example.com
> 	   ^^^^
> 
> Resolves: rhbz#659477
> 
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
> ---
>  rgmanager/src/resources/vm.sh |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
> index e23d5ba..22f29f1 100644
> --- a/rgmanager/src/resources/vm.sh
> +++ b/rgmanager/src/resources/vm.sh
> @@ -810,7 +810,6 @@ 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.
> @@ -826,6 +825,10 @@ 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 $?
>  }
> -- 
> 1.7.2.3