diff --git a/extra/resources/ping b/extra/resources/ping
index 541c279863..2319c2cda8 100755
--- a/extra/resources/ping
+++ b/extra/resources/ping
@@ -1,299 +1,299 @@
 #!/bin/sh
 #
 #
 #	Ping OCF RA that utilizes the system ping 
 #
 # Copyright (c) 2009 Andrew Beekhof
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 #######################################################################
 # Initialization:
 
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
 
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="ping">
 <version>1.0</version>
 
 <longdesc lang="en">
 Every time the monitor action is run, this resource agent records (in the CIB) the current number of ping nodes the host can connect to.
 It is essentially the same as pingd except that it uses the system ping tool to obtain the results.
 </longdesc>
 <shortdesc lang="en">node connectivity</shortdesc>
 
 <parameters>
 
 <parameter name="pidfile" unique="0">
 <longdesc lang="en">PID file</longdesc>
 <shortdesc lang="en">PID file</shortdesc>
 <content type="string" default="$HA_VARRUN/ping-${OCF_RESOURCE_INSTANCE}" />
 </parameter>
 
 <parameter name="dampen" unique="0">
 <longdesc lang="en">
 The time to wait (dampening) further changes occur
 </longdesc>
 <shortdesc lang="en">Dampening interval</shortdesc>
 <content type="integer" default="5s"/>
 </parameter>
 
 <parameter name="name" unique="0">
 <longdesc lang="en">
 The name of the attributes to set.  This is the name to be used in the constraints.
 </longdesc>
 <shortdesc lang="en">Attribute name</shortdesc>
-<content type="integer" default="${OCF_RESOURCE_INSTANCE}"/>
+<content type="string" default="${OCF_RESOURCE_INSTANCE}"/>
 </parameter>
 
 <parameter name="multiplier" unique="0">
 <longdesc lang="en">
 The number by which to multiply the number of connected ping nodes by
 </longdesc>
 <shortdesc lang="en">Value multiplier</shortdesc>
 <content type="integer" default=""/>
 </parameter>
 
 <parameter name="host_list" unique="0">
 <longdesc lang="en">
 The list of ping nodes to count.  Defaults to all configured ping nodes.  Rarely needs to be specified.
 </longdesc>
 <shortdesc lang="en">Host list</shortdesc>
-<content type="integer" default=""/>
+<content type="string" default=""/>
 </parameter>
 
 <parameter name="attempts" unique="0">
 <longdesc lang="en">
 Number of ping attempts, per host, before declaring it dead
 </longdesc>
 <shortdesc lang="en">no. of ping attempts</shortdesc>
 <content type="integer" default="2"/>
 </parameter>
 
 <parameter name="timeout" unique="0">
 <longdesc lang="en">
 How long, in seconds, to wait before declaring a ping lost
 </longdesc>
 <shortdesc lang="en">ping timeout in seconds</shortdesc>
 <content type="integer" default="2"/>
 </parameter>
 
 <parameter name="options" unique="0">
 <longdesc lang="en">
 A catch all for any other options that need to be passed to ping.
 </longdesc>
 <shortdesc lang="en">Extra Options</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="debug" unique="0">
 <longdesc lang="en">
 Enables to use default attrd_updater verbose logging on every call.
 </longdesc>
 <shortdesc lang="en">Verbose logging</shortdesc>
 <content type="string" default="false"/>
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"   timeout="60" />
 <action name="stop"    timeout="20" />
 <action name="reload"  timeout="100" />
 <action name="monitor" depth="0"  timeout="60" interval="10"/>
 <action name="meta-data"  timeout="5" />
 <action name="validate-all"  timeout="30" />
 </actions>
 </resource-agent>
 END
 }
 
 #######################################################################
 
 # don't exit on TERM, to test that lrmd makes sure that we do exit
 trap sigterm_handler TERM
 sigterm_handler() {
 	ocf_log info "They use TERM to bring us down. No such luck."
 	return
 }
 
 ping_usage() {
 	cat <<END
 usage: $0 {start|stop|monitor|migrate_to|migrate_from|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 ping_start() {
     ping_monitor
     if [ $? =  $OCF_SUCCESS ]; then
 	return $OCF_SUCCESS
     fi
     touch ${OCF_RESKEY_pidfile}
     ping_update
 }
 
 ping_stop() {
 
 	rm -f ${OCF_RESKEY_pidfile}
     
     attrd_updater -D -n $OCF_RESKEY_name -d $OCF_RESKEY_dampen $attrd_options
     
     return $OCF_SUCCESS
 }
 
 ping_monitor() {
     if [ -f ${OCF_RESKEY_pidfile} ]; then
 	ping_update
 	return $OCF_SUCCESS
     fi
     return $OCF_NOT_RUNNING
 }
 
 ping_validate() {
     
     # Is the state directory writable? 
     state_dir=`dirname "$OCF_RESKEY_pidfile"`
     touch "$state_dir/$$"
     if [ $? != 0 ]; then
 	ocf_log err "Invalid location for 'state': $state_dir is not writable"
 	return $OCF_ERR_ARGS
     fi
     rm "$state_dir/$$"
 
 # Pidfile better be an absolute path
     case $OCF_RESKEY_pidfile in
 	/*) ;;
 	*) ocf_log warn "You should use an absolute path for pidfile not: $OCF_RESKEY_pidfile" ;;
     esac
     
 # Check the ping interval
     if ocf_is_decimal "$OCF_RESKEY_CRM_meta_interval" && [ $OCF_RESKEY_CRM_meta_interval -gt 0 ]; then
 	:
     else
 	ocf_log err "Invalid ping interval $OCF_RESKEY_interval. It should be positive integer!"
 	exit $OCF_ERR_CONFIGURED
     fi
 
 # Check the host list
     if [ "x" = "x$OCF_RESKEY_host_list" ]; then 
 	ocf_log err "Empty host_list.  Please specify some nodes to ping"
 	exit $OCF_ERR_CONFIGURED
     fi
 
 # Check the debug option    
     if [ "x" = "x${OCF_RESKEY_debug}" ]; then
         ocf_log err "Debug option not specified. Please specify 'true' or 'false'"
         exit $OCF_ERR_CONFIGURED
     elif [ "${OCF_RESKEY_debug}" != "true" -a "${OCF_RESKEY_debug}" != "false" ]; then
         ocf_log err "Debug option specified is not correct. Please specify 'true' or 'false'"
         exit $OCF_ERR_CONFIGURED
     fi
 
     check_binary ping
 
     return $OCF_SUCCESS
 }
 
 ping_update() {
     active=0
     for host in $OCF_RESKEY_host_list; do
 	p_exe=ping
 
 	case `uname` in
 	    Linux) p_args="-n -q -W $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts";;
 	    Darwin) p_args="-n -q -t $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts -o";;
 	    *) ocf_log err "Unknown host type: `uname`"; exit $OCF_ERR_INSTALLED;;
 	esac
 
 	case $host in
 	    *:*) p_exe=ping6
 	esac
 	
 	p_out=`$p_exe $p_args $OCF_RESKEY_options $host 2>&1`; rc=$?
 
 	case $rc in
 	    0) active=`expr $active + 1`;;
 	    1) ocf_log debug "$host is inactive: $p_out";;
 	    *) ocf_log err "Unexpected result for '$p_exe $p_args $OCF_RESKEY_options $host' $rc: $p_out";;
 	esac
     done
     score=`expr $active \* $OCF_RESKEY_multiplier`
     attrd_updater -n $OCF_RESKEY_name -v $score -d $OCF_RESKEY_dampen $attrd_options
 }
 
 : ${OCF_RESKEY_name:="pingd"}
 : ${OCF_RESKEY_dampen:="5s"}
 : ${OCF_RESKEY_attempts:="5"}
 : ${OCF_RESKEY_multiplier:="1"}
 : ${OCF_RESKEY_debug:="false"}
 : ${OCF_RESKEY_CRM_meta_timeout:="60"}
 : ${OCF_RESKEY_CRM_meta_interval="10"}
 : ${OCF_RESKEY_CRM_meta_globally_unique:="true"}
 
 if [ -z ${OCF_RESKEY_timeout} ]; then
     OCF_RESKEY_timeout=`expr $OCF_RESKEY_CRM_meta_timeout / $OCF_RESKEY_attempts`
     OCF_RESKEY_timeout=`expr $OCF_RESKEY_timeout / 1100` # Convert to seconds and finish 10% early
 fi
 
 if [ ${OCF_RESKEY_timeout} -lt 1 ]; then
     OCF_RESKEY_timeout=5
 elif [ ${OCF_RESKEY_timeout} -gt 1000 ]; then
     # ping actually complains if this value is too high, 5 minutes is plenty
     OCF_RESKEY_timeout=300
 fi
 
 if [ ${OCF_RESKEY_CRM_meta_globally_unique} = "false" ]; then
     : ${OCF_RESKEY_pidfile:="$HA_VARRUN/ping-${OCF_RESKEY_name}"}
 else 
     : ${OCF_RESKEY_pidfile:="$HA_VARRUN/ping-${OCF_RESOURCE_INSTANCE}"}
 fi
 
 attrd_options='-q'
 if ocf_is_true ${OCF_RESKEY_debug} ; then
     attrd_options=''
 fi
 
 case $__OCF_ACTION in
 meta-data)	meta_data
 		exit $OCF_SUCCESS
 		;;
 start)		ping_start;;
 stop)		ping_stop;;
 monitor)	ping_monitor;;
 reload)		ping_start;;
 validate-all)	ping_validate;;
 usage|help)	ping_usage
 		exit $OCF_SUCCESS
 		;;
 *)		ping_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 exit $?
 
diff --git a/extra/resources/pingd b/extra/resources/pingd
index 3e5aeaa6e9..57e9e8f965 100644
--- a/extra/resources/pingd
+++ b/extra/resources/pingd
@@ -1,310 +1,310 @@
 #!/bin/sh
 #
 #
 #	pingd OCF Resource Agent
 #	Records (in the CIB) the current number of ping nodes a 
 #	   cluster node can connect to.
 #
 # Copyright (c) 2006 Andrew Beekhof
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 #######################################################################
 # Initialization:
 
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
 
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="pingd">
 <version>1.0</version>
 
 <longdesc lang="en">
 This is a pingd Resource Agent.
 It records (in the CIB) the current number of ping nodes a node can connect to.
 </longdesc>
 <shortdesc lang="en">pingd resource agent</shortdesc>
 
 <parameters>
 
 <parameter name="pidfile" unique="0">
 <longdesc lang="en">PID file</longdesc>
 <shortdesc lang="en">PID file</shortdesc>
 <content type="string" default="$HA_VARRUN/pingd-${OCF_RESOURCE_INSTANCE}" />
 </parameter>
 
 
 <parameter name="user" unique="0">
 <longdesc lang="en">
 The user we want to run pingd as
 </longdesc>
 <shortdesc lang="en">The user we want to run pingd as</shortdesc>
 <content type="string" default="root" />
 </parameter>
 
 <parameter name="dampen" unique="0">
 <longdesc lang="en">
 The time to wait (dampening) further changes occur
 </longdesc>
 <shortdesc lang="en">Dampening interval</shortdesc>
 <content type="integer" default="5s"/>
 </parameter>
 
 <parameter name="set" unique="0">
 <longdesc lang="en">
 The name of the instance_attributes set to place the value in.  Rarely needs to be specified.
 </longdesc>
 <shortdesc lang="en">Set name</shortdesc>
-<content type="integer" default=""/>
+<content type="string" default=""/>
 </parameter>
 
 <parameter name="name" unique="0">
 <longdesc lang="en">
 The name of the attributes to set.  This is the name to be used in the constraints.
 </longdesc>
 <shortdesc lang="en">Attribute name</shortdesc>
-<content type="integer" default="${OCF_RESOURCE_INSTANCE}"/>
+<content type="string" default="${OCF_RESOURCE_INSTANCE}"/>
 </parameter>
 
 <parameter name="section" unique="0">
 <longdesc lang="en">
 The section place the value in.  Rarely needs to be specified.
 </longdesc>
 <shortdesc lang="en">Section name</shortdesc>
-<content type="integer" default=""/>
+<content type="string" default=""/>
 </parameter>
 
 <parameter name="multiplier" unique="0">
 <longdesc lang="en">
 The number by which to multiply the number of connected ping nodes by
 </longdesc>
 <shortdesc lang="en">Value multiplier</shortdesc>
 <content type="integer" default=""/>
 </parameter>
 
 <parameter name="host_list" unique="0">
 <longdesc lang="en">
 The list of ping nodes to count.  Defaults to all configured ping nodes.  Rarely needs to be specified.
 </longdesc>
 <shortdesc lang="en">Host list</shortdesc>
-<content type="integer" default=""/>
+<content type="string" default=""/>
 </parameter>
 
 <parameter name="interval" unique="0">
 <longdesc lang="en">
 How often, in seconds, to check for node liveliness
 </longdesc>
 <shortdesc lang="en">ping interval in seconds</shortdesc>
 <content type="integer" default="1"/>
 </parameter>
 
 <parameter name="attempts" unique="0">
 <longdesc lang="en">
 Number of ping attempts, per host, before declaring it dead
 </longdesc>
 <shortdesc lang="en">no. of ping attempts</shortdesc>
 <content type="integer" default="2"/>
 </parameter>
 
 <parameter name="timeout" unique="0">
 <longdesc lang="en">
 How long, in seconds, to wait before declaring a ping lost
 </longdesc>
 <shortdesc lang="en">ping timeout in seconds</shortdesc>
 <content type="integer" default="2"/>
 </parameter>
 
 <parameter name="options" unique="0">
 <longdesc lang="en">
 A catch all for any other options that need to be passed to pingd.
 </longdesc>
 <shortdesc lang="en">Extra Options</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"   timeout="90" />
 <action name="stop"    timeout="100" />
 <action name="monitor" depth="0"  timeout="20" interval="10" start-delay="1m" />
 <action name="meta-data"  timeout="5" />
 <action name="validate-all"  timeout="30" />
 </actions>
 </resource-agent>
 END
 }
 
 #######################################################################
 
 pingd_usage() {
 	cat <<END
 usage: $0 {start|stop|monitor|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 pingd_start() {
     extras=""
     if [ ! -z "$OCF_RESKEY_multiplier" ]; then
 	extras="$extras -m $OCF_RESKEY_multiplier"
     fi
     if [ ! -z "$OCF_RESKEY_set" ]; then
 	extras="$extras -s $OCF_RESKEY_set"
     fi
     if [ ! -z "$OCF_RESKEY_section" ]; then
 	extras="$extras -S $OCF_RESKEY_section"
     fi
     if [ ! -z "$OCF_RESKEY_interval" ]; then
         extras="$extras -i $OCF_RESKEY_interval"
     fi
     if [ ! -z "$OCF_RESKEY_attempts" ]; then
         extras="$extras -n $OCF_RESKEY_attempts"
     fi
     if [ ! -z "$OCF_RESKEY_timeout" ]; then
         extras="$extras -t $OCF_RESKEY_timeout"
     fi
     for a_host in $OCF_RESKEY_host_list; do
 	extras="$extras -h $a_host"
     done
     pingd_cmd="${HA_BIN}/pingd -D -p $OCF_RESKEY_pidfile -a $OCF_RESKEY_name -d $OCF_RESKEY_dampen $extras $OCF_RESKEY_options"
 
     if [ ! -z $OCF_RESKEY_user ]; then
 	sudo -u $OCF_RESKEY_user $pingd_cmd
     else
 	$pingd_cmd
     fi
 
     rc=$?
     if [ $rc = 0 ]; then
 	exit $OCF_SUCCESS
     fi
     
     ocf_log err "Could not run $pingd_cmd : rc=$rc"
     exit $OCF_ERR_GENERIC
 }
 
 pingd_stop() {
     if [ -f $OCF_RESKEY_pidfile ]; then
 	pid=`cat $OCF_RESKEY_pidfile`
     fi
     if [ ! -z $pid ]; then
 	kill -TERM $pid
 	rc=$?
 
 	if [ $rc = 0 -o $rc = 1 ]; then
 	    rm $OCF_RESKEY_pidfile
 	    exit $OCF_SUCCESS
 	fi
 
 	ocf_log err "Unexpected result from kill -TERM $pid: $rc"
 	exit $OCF_ERR_GENERIC
     fi
     exit $OCF_SUCCESS
 }
 
 pingd_monitor() {
     if [ -f $OCF_RESKEY_pidfile ]; then
 	pid=`cat $OCF_RESKEY_pidfile`
     fi
     if [ ! -z $pid ]; then
 	kill -0 $pid
 	if [ $? = 0 ]; then
 	    exit $OCF_SUCCESS
 	fi
     fi
     exit $OCF_NOT_RUNNING
 }
 
 pingd_validate() {
 # Existence of the user
     if [ ! -z $OCF_RESKEY_user ]; then
 	getent passwd "$OCF_RESKEY_user" >/dev/null
 	if [ $? -eq 0 ]; then
 	    : Yes, user exists. We can further check his permission on crm_mon if necessary
 	else
 	    ocf_log err "The user $OCF_RESKEY_user does not exist!"
 	    exit $OCF_ERR_ARGS
 	fi
     fi
 
 # Pidfile better be an absolute path
     case $OCF_RESKEY_pidfile in
 	/*) ;;
 	*) ocf_log warn "You should have pidfile($OCF_RESKEY_pidfile) of absolute path!" ;;
     esac
 
 # Check the ping interval
     if ocf_is_decimal "$OCF_RESKEY_interval" && [ $OCF_RESKEY_interval -gt 0 ]; then
 	:
     else
 	ocf_log err "Invalid ping interval $OCF_RESKEY_interval. It should be positive integer!"
 	exit $OCF_ERR_ARGS
     fi
 
     echo "Validate OK"
     return $OCF_SUCCESS
 }
 
 if [ $# -ne 1 ]; then
     pingd_usage
     exit $OCF_ERR_ARGS
 fi
 
 : ${OCF_RESKEY_options:=""}
 : ${OCF_RESKEY_dampen:="5s"}
 : ${OCF_RESKEY_interval:="1"}
 : ${OCF_RESKEY_name:="pingd"}
 : ${OCF_RESKEY_CRM_meta_interval:=0}
 : ${OCF_RESKEY_CRM_meta_globally_unique:="true"}
 
 if [ ${OCF_RESKEY_CRM_meta_globally_unique} = "false" ]; then
     : ${OCF_RESKEY_pidfile:="$HA_VARRUN/pingd-${OCF_RESKEY_name}"}
 else 
     : ${OCF_RESKEY_pidfile:="$HA_VARRUN/pingd-${OCF_RESOURCE_INSTANCE}"}
 fi
 
 case $__OCF_ACTION in
 meta-data)	meta_data
 		exit $OCF_SUCCESS
 		;;
 start)		pingd_start
 		;;
 stop)		pingd_stop
 		;;
 monitor)	pingd_monitor
 		;;
 validate-all)	pingd_validate
 		;;
 usage|help)	pingd_usage
 		exit $OCF_SUCCESS
 		;;
 *)		pingd_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 
 exit $?