Merge branch 'akurz-conntrackd' into upstream-master

heartbeat/conntrackd

@@ -36,15 +36,18 @@
 
 OCF_RESKEY_binary_default=conntrackd
 OCF_RESKEY_config_default=/etc/conntrackd/conntrackd.conf
-: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
+
+# For users of versions prior to 1.2:
+# Map renamed parameter "conntrackd" to "binary" if in use
+: ${OCF_RESKEY_binary=${OCF_RESKEY_conntrackd-${OCF_RESKEY_binary_default}}}
 : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="conntrackd">
-<version>1.1</version>
+<version>1.2</version>
 
 <longdesc lang="en">
 Master/Slave OCF Resource Agent for conntrackd
@@ -53,7 +56,7 @@ Master/Slave OCF Resource Agent for conntrackd
 <shortdesc lang="en">This resource agent manages conntrackd</shortdesc>
 
 <parameters>
-<parameter name="conntrackd">
+<parameter name="binary">
 <longdesc lang="en">Name of the conntrackd executable.
 If conntrackd is installed and available in the default PATH, it is sufficient to configure the name of the binary
 For example "my-conntrackd-binary-version-0.9.14"
@@ -205,7 +208,6 @@ conntrackd_validate_all() {
         meta_expect master-node-max = 1
         meta_expect master-max = 1
         meta_expect clone-node-max = 1
-        meta_expect clone-max = 2
 
 	return $OCF_SUCCESS
 }