Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 1042bd4beb2f201459112a06052655760fadd521
Parent: 6f9e71a735281ae034cb9741a499b01127f9712e
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Jun 3 14:05:31 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Thu Jun 3 14:05:31 2010 -0400
Revert "resource-agents: Add status_program attribute"
This reverts commit 4c44c6e523a4c8521f55fc7330508c493da379f5.
---
rgmanager/src/resources/vm.sh | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 2a995eb..d2932dd 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -213,20 +213,6 @@ meta_data()
<content type="string" default="0"/>
</parameter>
- <parameter name="status_program" reconfig="1">
- <longdesc lang="en">
- Ordinarily, only the presence/health of a virtual machine
- is checked. If specified, the status_program value is
- executed during a depth 10 check. The intent of this
- program is to ascertain the status of critical services
- within a virtual machine.
- </longdesc>
- <shortdesc lang="en">
- Additional status check program
- </shortdesc>
- <content type="string" default="0"/>
- </parameter>
-
<parameter name="hypervisor">
<shortdesc lang="en">
Hypervisor
@@ -269,10 +255,6 @@ meta_data()
<action name="status" timeout="10"
interval="30"/>
<action name="monitor" timeout="10"
interval="30"/>
- <!-- depth 10 calls the status_program -->
- <action name="status" depth="10" timeout="10"
interval="300"/>
- <action name="monitor" depth="10" timeout="10"
interval="300"/>
-
<!-- reconfigure - reconfigure with new OCF parameters.
NOT OCF COMPATIBLE AT ALL -->
<action name="reconfig" timeout="10"/>
@@ -561,11 +543,7 @@ virsh_status()
return 0
fi
- if [ "$state" = "shut off" ]; then
- return $OCF_NOT_RUNNING
- fi
-
- return $OCF_ERR_GENERIC
+ return 1
}
@@ -945,15 +923,6 @@ case $1 in
validate_all || exit $OCF_ERR_ARGS
echo -n "Virtual machine $OCF_RESKEY_name is "
do_status
- rv=$?
- if [ $rv -ne 0 ]; then
- exit $rv
- fi
- [ -z "$OCF_RESKEY_status_program" ] && exit 0
- [ -z "$OCF_CHECK_LEVEL" ] && exit 0
- [ $OCF_CHECK_LEVEL -lt 10 ] && exit 0
-
- bash -c "$OCF_RESKEY_status_program" &> /dev/null
exit $?
;;
migrate)