cluster: STABLE3 - resource-agents: Clear vm.sh default

Lon Hohberger lon at fedoraproject.org
Mon Mar 1 21:21:24 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5155e0a2fd30e9a3ee3b0b9d27b7418b9cdb71d4
Commit:        5155e0a2fd30e9a3ee3b0b9d27b7418b9cdb71d4
Parent:        b0836467149ce13739f5f96e21fdd3568c665a4a
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Mon Mar 1 16:17:17 2010 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Mar 1 16:17:17 2010 -0500

resource-agents: Clear vm.sh default

The default behavior of vm.sh is to use_virsh whenever
possible.  The problem with specifying a default in the
RA metadata is that it causes rgmanager to provide a
value to the RA when it is called.  In this case, rgmanager
was providing "1" as the default, meaning that the logic
which carefully determines whether to use 'xm' or 'virsh'
is disabled.

This is not seen when testing the resource agent by
hand; it is only seen when called in the context of
rgmanager or rg_test.

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

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 0b5f4b1..35de1d8 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -128,7 +128,7 @@ meta_data()
 		virtual machines instead of xm.  This is required when
 		using non-Xen virtual machines (e.g. qemu / KVM).
 	    </shortdesc>
-            <content type="integer" default="1"/>
+            <content type="integer" default=""/>
         </parameter>
 
 	<parameter name="xmlfile">


More information about the cluster-commits mailing list