Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 995e5675526c1442b0dc0e3036adad3eb28b55fd
Parent: c9ff58e8282948fa92bb82c05d40858a22ac61e6
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Dec 2 14:40:18 2010 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Jan 31 17:49:15 2011 -0500
resource-agents: Fix migrateuriopt setting
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#660337
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(a)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 $?
}