Merging upstream version 2.1.8~rc1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2486 insertions, 114 deletions

diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp
index accf781..6eef178 100644
--- a/cts/cli/regression.tools.exp
+++ b/cts/cli/regression.tools.exp
@@ -23,6 +23,910 @@ A new shadow instance was created. To begin using it, enter the following into y
 </cib>
 =#=#=#= End test: Validate CIB - OK (0) =#=#=#=
 * Passed: cibadmin       - Validate CIB
+=#=#=#= Begin test: List all available options (invalid type) =#=#=#=
+crm_attribute: Invalid --list-options value 'asdf'. Allowed values: cluster
+=#=#=#= End test: List all available options (invalid type) - Incorrect usage (64) =#=#=#=
+* Passed: crm_attribute  - List all available options (invalid type)
+=#=#=#= Begin test: List all available options (invalid type) (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute --list-options=asdf --output-as=xml">
+  <status code="64" message="Incorrect usage">
+    <errors>
+      <error>crm_attribute: Invalid --list-options value 'asdf'. Allowed values: cluster</error>
+    </errors>
+  </status>
+</pacemaker-result>
+=#=#=#= End test: List all available options (invalid type) (XML) - Incorrect usage (64) =#=#=#=
+* Passed: crm_attribute  - List all available options (invalid type) (XML)
+=#=#=#= Begin test: List non-advanced cluster options =#=#=#=
+Pacemaker cluster options
+
+Also known as properties, these are options that affect behavior across the entire cluster. They are configured within cluster_property_set elements inside the crm_config subsection of the CIB configuration section.
+
+  * dc-version: Pacemaker version on cluster node elected Designated Controller (DC)
+    * Includes a hash which identifies the exact revision the code was built from. Used for diagnostic purposes.
+    * Possible values (generated by Pacemaker): version (no default)
+
+  * cluster-infrastructure: The messaging layer on which Pacemaker is currently running
+    * Used for informational and diagnostic purposes.
+    * Possible values (generated by Pacemaker): string (no default)
+
+  * cluster-name: An arbitrary name for the cluster
+    * This optional value is mostly for users' convenience as desired in administration, but may also be used in Pacemaker configuration rules via the #cluster-name node attribute, and by higher-level tools and resource agents.
+    * Possible values: string (no default)
+
+  * dc-deadtime: How long to wait for a response from other nodes during start-up
+    * The optimal value will depend on the speed and load of your network and the type of switches used.
+    * Possible values: duration (default: )
+
+  * cluster-recheck-interval: Polling interval to recheck cluster state and evaluate rules with date specifications
+    * Pacemaker is primarily event-driven, and looks ahead to know when to recheck cluster state for failure-timeout settings and most time-based rules. However, it will also recheck the cluster after this amount of inactivity, to evaluate rules with date specifications and serve as a fail-safe for certain types of scheduler bugs. A value of 0 disables polling. A positive value sets an interval in seconds, unless other units are specified (for example, "5min").
+    * Possible values: duration (default: )
+
+  * fence-reaction: How a cluster node should react if notified of its own fencing
+    * A cluster node may receive notification of a "succeeded" fencing that targeted it if fencing is misconfigured, or if fabric fencing is in use that doesn't cut cluster communication. Use "stop" to attempt to immediately stop Pacemaker and stay stopped, or "panic" to attempt to immediately reboot the local node, falling back to stop on failure.
+    * Possible values: "stop" (default), "panic"
+
+  * no-quorum-policy: What to do when the cluster does not have quorum
+    * Possible values: "stop" (default), "freeze", "ignore", "demote", "suicide"
+
+  * shutdown-lock: Whether to lock resources to a cleanly shut down node
+    * When true, resources active on a node when it is cleanly shut down are kept "locked" to that node (not allowed to run elsewhere) until they start again on that node after it rejoins (or for at most shutdown-lock-limit, if set). Stonith resources and Pacemaker Remote connections are never locked. Clone and bundle instances and the promoted role of promotable clones are currently never locked, though support could be added in a future release.
+    * Possible values: boolean (default: )
+
+  * shutdown-lock-limit: Do not lock resources to a cleanly shut down node longer than this
+    * If shutdown-lock is true and this is set to a nonzero time duration, shutdown locks will expire after this much time has passed since the shutdown was initiated, even if the node has not rejoined.
+    * Possible values: duration (default: )
+
+  * enable-acl: Enable Access Control Lists (ACLs) for the CIB
+    * Possible values: boolean (default: )
+
+  * symmetric-cluster: Whether resources can run on any node by default
+    * Possible values: boolean (default: )
+
+  * maintenance-mode: Whether the cluster should refrain from monitoring, starting, and stopping resources
+    * Possible values: boolean (default: )
+
+  * start-failure-is-fatal: Whether a start failure should prevent a resource from being recovered on the same node
+    * When true, the cluster will immediately ban a resource from a node if it fails to start there. When false, the cluster will instead check the resource's fail count against its migration-threshold.
+    * Possible values: boolean (default: )
+
+  * enable-startup-probes: Whether the cluster should check for active resources during start-up
+    * Possible values: boolean (default: )
+
+  * stonith-action: Action to send to fence device when a node needs to be fenced ("poweroff" is a deprecated alias for "off")
+    * Possible values: "reboot" (default), "off", "poweroff"
+
+  * stonith-timeout: How long to wait for on, off, and reboot fence actions to complete by default
+    * Possible values: duration (default: )
+
+  * have-watchdog: Whether watchdog integration is enabled
+    * This is set automatically by the cluster according to whether SBD is detected to be in use. User-configured values are ignored. The value `true` is meaningful if diskless SBD is used and `stonith-watchdog-timeout` is nonzero. In that case, if fencing is required, watchdog-based self-fencing will be performed via SBD without requiring a fencing resource explicitly configured.
+    * Possible values (generated by Pacemaker): boolean (default: )
+
+  * stonith-watchdog-timeout: How long before nodes can be assumed to be safely down when watchdog-based self-fencing via SBD is in use
+    * If this is set to a positive value, lost nodes are assumed to achieve self-fencing using watchdog-based SBD within this much time. This does not require a fencing resource to be explicitly configured, though a fence_watchdog resource can be configured, to limit use to specific nodes. If this is set to 0 (the default), the cluster will never assume watchdog-based self-fencing. If this is set to a negative value, the cluster will use twice the local value of the `SBD_WATCHDOG_TIMEOUT` environment variable if that is positive, or otherwise treat this as 0. WARNING: When used, this timeout must be larger than `SBD_WATCHDOG_TIMEOUT` on all nodes that use watchdog-based SBD, and Pacemaker will refuse to start on any of those nodes where this is not true for the local value or SBD is not active. When this is set to a negative value, `SBD_WATCHDOG_TIMEOUT` must be set to the same value on all nodes that use SBD, otherwise data corruption or loss could occur.
+    * Possible values: timeout (default: )
+
+  * stonith-max-attempts: How many times fencing can fail before it will no longer be immediately re-attempted on a target
+    * Possible values: score (default: )
+
+  * concurrent-fencing: Allow performing fencing operations in parallel
+    * Possible values: boolean (default: )
+
+  * priority-fencing-delay: Apply fencing delay targeting the lost nodes with the highest total resource priority
+    * Apply specified delay for the fencings that are targeting the lost nodes with the highest total resource priority in case we don't have the majority of the nodes in our cluster partition, so that the more significant nodes potentially win any fencing match, which is especially meaningful under split-brain of 2-node cluster. A promoted resource instance takes the base priority + 1 on calculation if the base priority is not 0. Any static/random delays that are introduced by `pcmk_delay_base/max` configured for the corresponding fencing resources will be added to this delay. This delay should be significantly greater than, safely twice, the maximum `pcmk_delay_base/max`. By default, priority fencing delay is disabled.
+    * Possible values: duration (default: )
+
+  * node-pending-timeout: How long to wait for a node that has joined the cluster to join the controller process group
+    * Fence nodes that do not join the controller process group within this much time after joining the cluster, to allow the cluster to continue managing resources. A value of 0 means never fence pending nodes. Setting the value to 2h means fence nodes after 2 hours.
+    * Possible values: duration (default: )
+
+  * cluster-delay: Maximum time for node-to-node communication
+    * The node elected Designated Controller (DC) will consider an action failed if it does not get a response from the node executing the action within this time (after considering the action's own timeout). The "correct" value will depend on the speed and load of your network and cluster nodes.
+    * Possible values: duration (default: )
+
+  * load-threshold: Maximum amount of system load that should be used by cluster nodes
+    * The cluster will slow down its recovery process when the amount of system resources used (currently CPU) approaches this limit
+    * Possible values: percentage (default: )
+
+  * node-action-limit: Maximum number of jobs that can be scheduled per node (defaults to 2x cores)
+    * Possible values: integer (default: )
+
+  * batch-limit: Maximum number of jobs that the cluster may execute in parallel across all nodes
+    * The "correct" value will depend on the speed and load of your network and cluster nodes. If set to 0, the cluster will impose a dynamically calculated limit when any node has a high load.
+    * Possible values: integer (default: )
+
+  * migration-limit: The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)
+    * Possible values: integer (default: )
+
+  * cluster-ipc-limit: Maximum IPC message backlog before disconnecting a cluster daemon
+    * Raise this if log has "Evicting client" messages for cluster daemon PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).
+    * Possible values: nonnegative_integer (default: )
+
+  * stop-all-resources: Whether the cluster should stop all active resources
+    * Possible values: boolean (default: )
+
+  * stop-orphan-resources: Whether to stop resources that were removed from the configuration
+    * Possible values: boolean (default: )
+
+  * stop-orphan-actions: Whether to cancel recurring actions removed from the configuration
+    * Possible values: boolean (default: )
+
+  * pe-error-series-max: The number of scheduler inputs resulting in errors to save
+    * Zero to disable, -1 to store unlimited.
+    * Possible values: integer (default: )
+
+  * pe-warn-series-max: The number of scheduler inputs resulting in warnings to save
+    * Zero to disable, -1 to store unlimited.
+    * Possible values: integer (default: )
+
+  * pe-input-series-max: The number of scheduler inputs without errors or warnings to save
+    * Zero to disable, -1 to store unlimited.
+    * Possible values: integer (default: )
+
+  * node-health-strategy: How cluster should react to node health attributes
+    * Requires external entities to create node attributes (named with the prefix "#health") with values "red", "yellow", or "green".
+    * Possible values: "none" (default), "migrate-on-red", "only-green", "progressive", "custom"
+
+  * node-health-base: Base health score assigned to a node
+    * Only used when "node-health-strategy" is set to "progressive".
+    * Possible values: score (default: )
+
+  * node-health-green: The score to use for a node health attribute whose value is "green"
+    * Only used when "node-health-strategy" is set to "custom" or "progressive".
+    * Possible values: score (default: )
+
+  * node-health-yellow: The score to use for a node health attribute whose value is "yellow"
+    * Only used when "node-health-strategy" is set to "custom" or "progressive".
+    * Possible values: score (default: )
+
+  * node-health-red: The score to use for a node health attribute whose value is "red"
+    * Only used when "node-health-strategy" is set to "custom" or "progressive".
+    * Possible values: score (default: )
+
+  * placement-strategy: How the cluster should allocate resources to nodes
+    * Possible values: "default" (default), "utilization", "minimal", "balanced"
+=#=#=#= End test: List non-advanced cluster options - OK (0) =#=#=#=
+* Passed: crm_attribute  - List non-advanced cluster options
+=#=#=#= Begin test: List non-advanced cluster options (XML) (shows all) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute --list-options=cluster --output-as=xml">
+  <resource-agent name="cluster-options" version="">
+    <version>1.1</version>
+    <longdesc lang="en">Also known as properties, these are options that affect behavior across the entire cluster. They are configured within cluster_property_set elements inside the crm_config subsection of the CIB configuration section.</longdesc>
+    <shortdesc lang="en">Pacemaker cluster options</shortdesc>
+    <parameters>
+      <parameter name="dc-version" advanced="0" generated="1">
+        <longdesc lang="en">Includes a hash which identifies the exact revision the code was built from. Used for diagnostic purposes.</longdesc>
+        <shortdesc lang="en">Pacemaker version on cluster node elected Designated Controller (DC)</shortdesc>
+        <content type="version"/>
+      </parameter>
+      <parameter name="cluster-infrastructure" advanced="0" generated="1">
+        <longdesc lang="en">Used for informational and diagnostic purposes.</longdesc>
+        <shortdesc lang="en">The messaging layer on which Pacemaker is currently running</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="cluster-name" advanced="0" generated="0">
+        <longdesc lang="en">This optional value is mostly for users' convenience as desired in administration, but may also be used in Pacemaker configuration rules via the #cluster-name node attribute, and by higher-level tools and resource agents.</longdesc>
+        <shortdesc lang="en">An arbitrary name for the cluster</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="dc-deadtime" advanced="0" generated="0">
+        <longdesc lang="en">The optimal value will depend on the speed and load of your network and the type of switches used.</longdesc>
+        <shortdesc lang="en">How long to wait for a response from other nodes during start-up</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="cluster-recheck-interval" advanced="0" generated="0">
+        <longdesc lang="en">Pacemaker is primarily event-driven, and looks ahead to know when to recheck cluster state for failure-timeout settings and most time-based rules. However, it will also recheck the cluster after this amount of inactivity, to evaluate rules with date specifications and serve as a fail-safe for certain types of scheduler bugs. A value of 0 disables polling. A positive value sets an interval in seconds, unless other units are specified (for example, "5min").</longdesc>
+        <shortdesc lang="en">Polling interval to recheck cluster state and evaluate rules with date specifications</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="fence-reaction" advanced="0" generated="0">
+        <longdesc lang="en">A cluster node may receive notification of a "succeeded" fencing that targeted it if fencing is misconfigured, or if fabric fencing is in use that doesn't cut cluster communication. Use "stop" to attempt to immediately stop Pacemaker and stay stopped, or "panic" to attempt to immediately reboot the local node, falling back to stop on failure.</longdesc>
+        <shortdesc lang="en">How a cluster node should react if notified of its own fencing</shortdesc>
+        <content type="select" default="">
+          <option value="stop"/>
+          <option value="panic"/>
+        </content>
+      </parameter>
+      <parameter name="election-timeout" advanced="1" generated="0">
+        <longdesc lang="en">Declare an election failed if it is not decided within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">Declare an election failed if it is not decided within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="shutdown-escalation" advanced="1" generated="0">
+        <longdesc lang="en">Exit immediately if shutdown does not complete within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">Exit immediately if shutdown does not complete within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="join-integration-timeout" advanced="1" generated="0">
+        <longdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="join-finalization-timeout" advanced="1" generated="0">
+        <longdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="transition-delay" advanced="1" generated="0">
+        <longdesc lang="en">Delay cluster recovery for this much time to allow for additional events to occur. Useful if your configuration is sensitive to the order in which ping updates arrive.</longdesc>
+        <shortdesc lang="en">Enabling this option will slow down cluster recovery under all conditions</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="no-quorum-policy" advanced="0" generated="0">
+        <longdesc lang="en">What to do when the cluster does not have quorum</longdesc>
+        <shortdesc lang="en">What to do when the cluster does not have quorum</shortdesc>
+        <content type="select" default="">
+          <option value="stop"/>
+          <option value="freeze"/>
+          <option value="ignore"/>
+          <option value="demote"/>
+          <option value="suicide"/>
+        </content>
+      </parameter>
+      <parameter name="shutdown-lock" advanced="0" generated="0">
+        <longdesc lang="en">When true, resources active on a node when it is cleanly shut down are kept "locked" to that node (not allowed to run elsewhere) until they start again on that node after it rejoins (or for at most shutdown-lock-limit, if set). Stonith resources and Pacemaker Remote connections are never locked. Clone and bundle instances and the promoted role of promotable clones are currently never locked, though support could be added in a future release.</longdesc>
+        <shortdesc lang="en">Whether to lock resources to a cleanly shut down node</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="shutdown-lock-limit" advanced="0" generated="0">
+        <longdesc lang="en">If shutdown-lock is true and this is set to a nonzero time duration, shutdown locks will expire after this much time has passed since the shutdown was initiated, even if the node has not rejoined.</longdesc>
+        <shortdesc lang="en">Do not lock resources to a cleanly shut down node longer than this</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="enable-acl" advanced="0" generated="0">
+        <longdesc lang="en">Enable Access Control Lists (ACLs) for the CIB</longdesc>
+        <shortdesc lang="en">Enable Access Control Lists (ACLs) for the CIB</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="symmetric-cluster" advanced="0" generated="0">
+        <longdesc lang="en">Whether resources can run on any node by default</longdesc>
+        <shortdesc lang="en">Whether resources can run on any node by default</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="maintenance-mode" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should refrain from monitoring, starting, and stopping resources</longdesc>
+        <shortdesc lang="en">Whether the cluster should refrain from monitoring, starting, and stopping resources</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="start-failure-is-fatal" advanced="0" generated="0">
+        <longdesc lang="en">When true, the cluster will immediately ban a resource from a node if it fails to start there. When false, the cluster will instead check the resource's fail count against its migration-threshold.</longdesc>
+        <shortdesc lang="en">Whether a start failure should prevent a resource from being recovered on the same node</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="enable-startup-probes" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should check for active resources during start-up</longdesc>
+        <shortdesc lang="en">Whether the cluster should check for active resources during start-up</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stonith-enabled" advanced="1" generated="0">
+        <longdesc lang="en">If false, unresponsive nodes are immediately assumed to be harmless, and resources that were active on them may be recovered elsewhere. This can result in a "split-brain" situation, potentially leading to data loss and/or service unavailability.</longdesc>
+        <shortdesc lang="en">Whether nodes may be fenced as part of recovery</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stonith-action" advanced="0" generated="0">
+        <longdesc lang="en">Action to send to fence device when a node needs to be fenced ("poweroff" is a deprecated alias for "off")</longdesc>
+        <shortdesc lang="en">Action to send to fence device when a node needs to be fenced ("poweroff" is a deprecated alias for "off")</shortdesc>
+        <content type="select" default="">
+          <option value="reboot"/>
+          <option value="off"/>
+          <option value="poweroff"/>
+        </content>
+      </parameter>
+      <parameter name="stonith-timeout" advanced="0" generated="0">
+        <longdesc lang="en">How long to wait for on, off, and reboot fence actions to complete by default</longdesc>
+        <shortdesc lang="en">How long to wait for on, off, and reboot fence actions to complete by default</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="have-watchdog" advanced="0" generated="1">
+        <longdesc lang="en">This is set automatically by the cluster according to whether SBD is detected to be in use. User-configured values are ignored. The value `true` is meaningful if diskless SBD is used and `stonith-watchdog-timeout` is nonzero. In that case, if fencing is required, watchdog-based self-fencing will be performed via SBD without requiring a fencing resource explicitly configured.</longdesc>
+        <shortdesc lang="en">Whether watchdog integration is enabled</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stonith-watchdog-timeout" advanced="0" generated="0">
+        <longdesc lang="en">If this is set to a positive value, lost nodes are assumed to achieve self-fencing using watchdog-based SBD within this much time. This does not require a fencing resource to be explicitly configured, though a fence_watchdog resource can be configured, to limit use to specific nodes. If this is set to 0 (the default), the cluster will never assume watchdog-based self-fencing. If this is set to a negative value, the cluster will use twice the local value of the `SBD_WATCHDOG_TIMEOUT` environment variable if that is positive, or otherwise treat this as 0. WARNING: When used, this timeout must be larger than `SBD_WATCHDOG_TIMEOUT` on all nodes that use watchdog-based SBD, and Pacemaker will refuse to start on any of those nodes where this is not true for the local value or SBD is not active. When this is set to a negative value, `SBD_WATCHDOG_TIMEOUT` must be set to the same value on all nodes that use SBD, otherwise data corruption or loss could occur.</longdesc>
+        <shortdesc lang="en">How long before nodes can be assumed to be safely down when watchdog-based self-fencing via SBD is in use</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="stonith-max-attempts" advanced="0" generated="0">
+        <longdesc lang="en">How many times fencing can fail before it will no longer be immediately re-attempted on a target</longdesc>
+        <shortdesc lang="en">How many times fencing can fail before it will no longer be immediately re-attempted on a target</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="concurrent-fencing" advanced="0" generated="0">
+        <longdesc lang="en">Allow performing fencing operations in parallel</longdesc>
+        <shortdesc lang="en">Allow performing fencing operations in parallel</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="startup-fencing" advanced="1" generated="0">
+        <longdesc lang="en">Setting this to false may lead to a "split-brain" situation, potentially leading to data loss and/or service unavailability.</longdesc>
+        <shortdesc lang="en">Whether to fence unseen nodes at start-up</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="priority-fencing-delay" advanced="0" generated="0">
+        <longdesc lang="en">Apply specified delay for the fencings that are targeting the lost nodes with the highest total resource priority in case we don't have the majority of the nodes in our cluster partition, so that the more significant nodes potentially win any fencing match, which is especially meaningful under split-brain of 2-node cluster. A promoted resource instance takes the base priority + 1 on calculation if the base priority is not 0. Any static/random delays that are introduced by `pcmk_delay_base/max` configured for the corresponding fencing resources will be added to this delay. This delay should be significantly greater than, safely twice, the maximum `pcmk_delay_base/max`. By default, priority fencing delay is disabled.</longdesc>
+        <shortdesc lang="en">Apply fencing delay targeting the lost nodes with the highest total resource priority</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="node-pending-timeout" advanced="0" generated="0">
+        <longdesc lang="en">Fence nodes that do not join the controller process group within this much time after joining the cluster, to allow the cluster to continue managing resources. A value of 0 means never fence pending nodes. Setting the value to 2h means fence nodes after 2 hours.</longdesc>
+        <shortdesc lang="en">How long to wait for a node that has joined the cluster to join the controller process group</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="cluster-delay" advanced="0" generated="0">
+        <longdesc lang="en">The node elected Designated Controller (DC) will consider an action failed if it does not get a response from the node executing the action within this time (after considering the action's own timeout). The "correct" value will depend on the speed and load of your network and cluster nodes.</longdesc>
+        <shortdesc lang="en">Maximum time for node-to-node communication</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="load-threshold" advanced="0" generated="0">
+        <longdesc lang="en">The cluster will slow down its recovery process when the amount of system resources used (currently CPU) approaches this limit</longdesc>
+        <shortdesc lang="en">Maximum amount of system load that should be used by cluster nodes</shortdesc>
+        <content type="percentage" default=""/>
+      </parameter>
+      <parameter name="node-action-limit" advanced="0" generated="0">
+        <longdesc lang="en">Maximum number of jobs that can be scheduled per node (defaults to 2x cores)</longdesc>
+        <shortdesc lang="en">Maximum number of jobs that can be scheduled per node (defaults to 2x cores)</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="batch-limit" advanced="0" generated="0">
+        <longdesc lang="en">The "correct" value will depend on the speed and load of your network and cluster nodes. If set to 0, the cluster will impose a dynamically calculated limit when any node has a high load.</longdesc>
+        <shortdesc lang="en">Maximum number of jobs that the cluster may execute in parallel across all nodes</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="migration-limit" advanced="0" generated="0">
+        <longdesc lang="en">The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)</longdesc>
+        <shortdesc lang="en">The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="cluster-ipc-limit" advanced="0" generated="0">
+        <longdesc lang="en">Raise this if log has "Evicting client" messages for cluster daemon PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).</longdesc>
+        <shortdesc lang="en">Maximum IPC message backlog before disconnecting a cluster daemon</shortdesc>
+        <content type="nonnegative_integer" default=""/>
+      </parameter>
+      <parameter name="stop-all-resources" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should stop all active resources</longdesc>
+        <shortdesc lang="en">Whether the cluster should stop all active resources</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stop-orphan-resources" advanced="0" generated="0">
+        <longdesc lang="en">Whether to stop resources that were removed from the configuration</longdesc>
+        <shortdesc lang="en">Whether to stop resources that were removed from the configuration</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stop-orphan-actions" advanced="0" generated="0">
+        <longdesc lang="en">Whether to cancel recurring actions removed from the configuration</longdesc>
+        <shortdesc lang="en">Whether to cancel recurring actions removed from the configuration</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="remove-after-stop" advanced="0" generated="0">
+        <deprecated/>
+        <longdesc lang="en">Values other than default are poorly tested and potentially dangerous.</longdesc>
+        <shortdesc lang="en">Whether to remove stopped resources from the executor</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="pe-error-series-max" advanced="0" generated="0">
+        <longdesc lang="en">Zero to disable, -1 to store unlimited.</longdesc>
+        <shortdesc lang="en">The number of scheduler inputs resulting in errors to save</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pe-warn-series-max" advanced="0" generated="0">
+        <longdesc lang="en">Zero to disable, -1 to store unlimited.</longdesc>
+        <shortdesc lang="en">The number of scheduler inputs resulting in warnings to save</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pe-input-series-max" advanced="0" generated="0">
+        <longdesc lang="en">Zero to disable, -1 to store unlimited.</longdesc>
+        <shortdesc lang="en">The number of scheduler inputs without errors or warnings to save</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="node-health-strategy" advanced="0" generated="0">
+        <longdesc lang="en">Requires external entities to create node attributes (named with the prefix "#health") with values "red", "yellow", or "green".</longdesc>
+        <shortdesc lang="en">How cluster should react to node health attributes</shortdesc>
+        <content type="select" default="">
+          <option value="none"/>
+          <option value="migrate-on-red"/>
+          <option value="only-green"/>
+          <option value="progressive"/>
+          <option value="custom"/>
+        </content>
+      </parameter>
+      <parameter name="node-health-base" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "progressive".</longdesc>
+        <shortdesc lang="en">Base health score assigned to a node</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="node-health-green" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "custom" or "progressive".</longdesc>
+        <shortdesc lang="en">The score to use for a node health attribute whose value is "green"</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="node-health-yellow" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "custom" or "progressive".</longdesc>
+        <shortdesc lang="en">The score to use for a node health attribute whose value is "yellow"</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="node-health-red" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "custom" or "progressive".</longdesc>
+        <shortdesc lang="en">The score to use for a node health attribute whose value is "red"</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="placement-strategy" advanced="0" generated="0">
+        <longdesc lang="en">How the cluster should allocate resources to nodes</longdesc>
+        <shortdesc lang="en">How the cluster should allocate resources to nodes</shortdesc>
+        <content type="select" default="">
+          <option value="default"/>
+          <option value="utilization"/>
+          <option value="minimal"/>
+          <option value="balanced"/>
+        </content>
+      </parameter>
+    </parameters>
+  </resource-agent>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List non-advanced cluster options (XML) (shows all) - OK (0) =#=#=#=
+* Passed: crm_attribute  - List non-advanced cluster options (XML) (shows all)
+=#=#=#= Begin test: List all available cluster options =#=#=#=
+Pacemaker cluster options
+
+Also known as properties, these are options that affect behavior across the entire cluster. They are configured within cluster_property_set elements inside the crm_config subsection of the CIB configuration section.
+
+  * dc-version: Pacemaker version on cluster node elected Designated Controller (DC)
+    * Includes a hash which identifies the exact revision the code was built from. Used for diagnostic purposes.
+    * Possible values (generated by Pacemaker): version (no default)
+
+  * cluster-infrastructure: The messaging layer on which Pacemaker is currently running
+    * Used for informational and diagnostic purposes.
+    * Possible values (generated by Pacemaker): string (no default)
+
+  * cluster-name: An arbitrary name for the cluster
+    * This optional value is mostly for users' convenience as desired in administration, but may also be used in Pacemaker configuration rules via the #cluster-name node attribute, and by higher-level tools and resource agents.
+    * Possible values: string (no default)
+
+  * dc-deadtime: How long to wait for a response from other nodes during start-up
+    * The optimal value will depend on the speed and load of your network and the type of switches used.
+    * Possible values: duration (default: )
+
+  * cluster-recheck-interval: Polling interval to recheck cluster state and evaluate rules with date specifications
+    * Pacemaker is primarily event-driven, and looks ahead to know when to recheck cluster state for failure-timeout settings and most time-based rules. However, it will also recheck the cluster after this amount of inactivity, to evaluate rules with date specifications and serve as a fail-safe for certain types of scheduler bugs. A value of 0 disables polling. A positive value sets an interval in seconds, unless other units are specified (for example, "5min").
+    * Possible values: duration (default: )
+
+  * fence-reaction: How a cluster node should react if notified of its own fencing
+    * A cluster node may receive notification of a "succeeded" fencing that targeted it if fencing is misconfigured, or if fabric fencing is in use that doesn't cut cluster communication. Use "stop" to attempt to immediately stop Pacemaker and stay stopped, or "panic" to attempt to immediately reboot the local node, falling back to stop on failure.
+    * Possible values: "stop" (default), "panic"
+
+  * no-quorum-policy: What to do when the cluster does not have quorum
+    * Possible values: "stop" (default), "freeze", "ignore", "demote", "suicide"
+
+  * shutdown-lock: Whether to lock resources to a cleanly shut down node
+    * When true, resources active on a node when it is cleanly shut down are kept "locked" to that node (not allowed to run elsewhere) until they start again on that node after it rejoins (or for at most shutdown-lock-limit, if set). Stonith resources and Pacemaker Remote connections are never locked. Clone and bundle instances and the promoted role of promotable clones are currently never locked, though support could be added in a future release.
+    * Possible values: boolean (default: )
+
+  * shutdown-lock-limit: Do not lock resources to a cleanly shut down node longer than this
+    * If shutdown-lock is true and this is set to a nonzero time duration, shutdown locks will expire after this much time has passed since the shutdown was initiated, even if the node has not rejoined.
+    * Possible values: duration (default: )
+
+  * enable-acl: Enable Access Control Lists (ACLs) for the CIB
+    * Possible values: boolean (default: )
+
+  * symmetric-cluster: Whether resources can run on any node by default
+    * Possible values: boolean (default: )
+
+  * maintenance-mode: Whether the cluster should refrain from monitoring, starting, and stopping resources
+    * Possible values: boolean (default: )
+
+  * start-failure-is-fatal: Whether a start failure should prevent a resource from being recovered on the same node
+    * When true, the cluster will immediately ban a resource from a node if it fails to start there. When false, the cluster will instead check the resource's fail count against its migration-threshold.
+    * Possible values: boolean (default: )
+
+  * enable-startup-probes: Whether the cluster should check for active resources during start-up
+    * Possible values: boolean (default: )
+
+  * stonith-action: Action to send to fence device when a node needs to be fenced ("poweroff" is a deprecated alias for "off")
+    * Possible values: "reboot" (default), "off", "poweroff"
+
+  * stonith-timeout: How long to wait for on, off, and reboot fence actions to complete by default
+    * Possible values: duration (default: )
+
+  * have-watchdog: Whether watchdog integration is enabled
+    * This is set automatically by the cluster according to whether SBD is detected to be in use. User-configured values are ignored. The value `true` is meaningful if diskless SBD is used and `stonith-watchdog-timeout` is nonzero. In that case, if fencing is required, watchdog-based self-fencing will be performed via SBD without requiring a fencing resource explicitly configured.
+    * Possible values (generated by Pacemaker): boolean (default: )
+
+  * stonith-watchdog-timeout: How long before nodes can be assumed to be safely down when watchdog-based self-fencing via SBD is in use
+    * If this is set to a positive value, lost nodes are assumed to achieve self-fencing using watchdog-based SBD within this much time. This does not require a fencing resource to be explicitly configured, though a fence_watchdog resource can be configured, to limit use to specific nodes. If this is set to 0 (the default), the cluster will never assume watchdog-based self-fencing. If this is set to a negative value, the cluster will use twice the local value of the `SBD_WATCHDOG_TIMEOUT` environment variable if that is positive, or otherwise treat this as 0. WARNING: When used, this timeout must be larger than `SBD_WATCHDOG_TIMEOUT` on all nodes that use watchdog-based SBD, and Pacemaker will refuse to start on any of those nodes where this is not true for the local value or SBD is not active. When this is set to a negative value, `SBD_WATCHDOG_TIMEOUT` must be set to the same value on all nodes that use SBD, otherwise data corruption or loss could occur.
+    * Possible values: timeout (default: )
+
+  * stonith-max-attempts: How many times fencing can fail before it will no longer be immediately re-attempted on a target
+    * Possible values: score (default: )
+
+  * concurrent-fencing: Allow performing fencing operations in parallel
+    * Possible values: boolean (default: )
+
+  * priority-fencing-delay: Apply fencing delay targeting the lost nodes with the highest total resource priority
+    * Apply specified delay for the fencings that are targeting the lost nodes with the highest total resource priority in case we don't have the majority of the nodes in our cluster partition, so that the more significant nodes potentially win any fencing match, which is especially meaningful under split-brain of 2-node cluster. A promoted resource instance takes the base priority + 1 on calculation if the base priority is not 0. Any static/random delays that are introduced by `pcmk_delay_base/max` configured for the corresponding fencing resources will be added to this delay. This delay should be significantly greater than, safely twice, the maximum `pcmk_delay_base/max`. By default, priority fencing delay is disabled.
+    * Possible values: duration (default: )
+
+  * node-pending-timeout: How long to wait for a node that has joined the cluster to join the controller process group
+    * Fence nodes that do not join the controller process group within this much time after joining the cluster, to allow the cluster to continue managing resources. A value of 0 means never fence pending nodes. Setting the value to 2h means fence nodes after 2 hours.
+    * Possible values: duration (default: )
+
+  * cluster-delay: Maximum time for node-to-node communication
+    * The node elected Designated Controller (DC) will consider an action failed if it does not get a response from the node executing the action within this time (after considering the action's own timeout). The "correct" value will depend on the speed and load of your network and cluster nodes.
+    * Possible values: duration (default: )
+
+  * load-threshold: Maximum amount of system load that should be used by cluster nodes
+    * The cluster will slow down its recovery process when the amount of system resources used (currently CPU) approaches this limit
+    * Possible values: percentage (default: )
+
+  * node-action-limit: Maximum number of jobs that can be scheduled per node (defaults to 2x cores)
+    * Possible values: integer (default: )
+
+  * batch-limit: Maximum number of jobs that the cluster may execute in parallel across all nodes
+    * The "correct" value will depend on the speed and load of your network and cluster nodes. If set to 0, the cluster will impose a dynamically calculated limit when any node has a high load.
+    * Possible values: integer (default: )
+
+  * migration-limit: The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)
+    * Possible values: integer (default: )
+
+  * cluster-ipc-limit: Maximum IPC message backlog before disconnecting a cluster daemon
+    * Raise this if log has "Evicting client" messages for cluster daemon PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).
+    * Possible values: nonnegative_integer (default: )
+
+  * stop-all-resources: Whether the cluster should stop all active resources
+    * Possible values: boolean (default: )
+
+  * stop-orphan-resources: Whether to stop resources that were removed from the configuration
+    * Possible values: boolean (default: )
+
+  * stop-orphan-actions: Whether to cancel recurring actions removed from the configuration
+    * Possible values: boolean (default: )
+
+  * pe-error-series-max: The number of scheduler inputs resulting in errors to save
+    * Zero to disable, -1 to store unlimited.
+    * Possible values: integer (default: )
+
+  * pe-warn-series-max: The number of scheduler inputs resulting in warnings to save
+    * Zero to disable, -1 to store unlimited.
+    * Possible values: integer (default: )
+
+  * pe-input-series-max: The number of scheduler inputs without errors or warnings to save
+    * Zero to disable, -1 to store unlimited.
+    * Possible values: integer (default: )
+
+  * node-health-strategy: How cluster should react to node health attributes
+    * Requires external entities to create node attributes (named with the prefix "#health") with values "red", "yellow", or "green".
+    * Possible values: "none" (default), "migrate-on-red", "only-green", "progressive", "custom"
+
+  * node-health-base: Base health score assigned to a node
+    * Only used when "node-health-strategy" is set to "progressive".
+    * Possible values: score (default: )
+
+  * node-health-green: The score to use for a node health attribute whose value is "green"
+    * Only used when "node-health-strategy" is set to "custom" or "progressive".
+    * Possible values: score (default: )
+
+  * node-health-yellow: The score to use for a node health attribute whose value is "yellow"
+    * Only used when "node-health-strategy" is set to "custom" or "progressive".
+    * Possible values: score (default: )
+
+  * node-health-red: The score to use for a node health attribute whose value is "red"
+    * Only used when "node-health-strategy" is set to "custom" or "progressive".
+    * Possible values: score (default: )
+
+  * placement-strategy: How the cluster should allocate resources to nodes
+    * Possible values: "default" (default), "utilization", "minimal", "balanced"
+
+  * ADVANCED OPTIONS:
+
+    * election-timeout: Declare an election failed if it is not decided within this much time. If you need to adjust this value, it probably indicates the presence of a bug.
+      * Possible values: duration (default: )
+
+    * shutdown-escalation: Exit immediately if shutdown does not complete within this much time. If you need to adjust this value, it probably indicates the presence of a bug.
+      * Possible values: duration (default: )
+
+    * join-integration-timeout: If you need to adjust this value, it probably indicates the presence of a bug.
+      * Possible values: duration (default: )
+
+    * join-finalization-timeout: If you need to adjust this value, it probably indicates the presence of a bug.
+      * Possible values: duration (default: )
+
+    * transition-delay: Enabling this option will slow down cluster recovery under all conditions
+      * Delay cluster recovery for this much time to allow for additional events to occur. Useful if your configuration is sensitive to the order in which ping updates arrive.
+      * Possible values: duration (default: )
+
+    * stonith-enabled: Whether nodes may be fenced as part of recovery
+      * If false, unresponsive nodes are immediately assumed to be harmless, and resources that were active on them may be recovered elsewhere. This can result in a "split-brain" situation, potentially leading to data loss and/or service unavailability.
+      * Possible values: boolean (default: )
+
+    * startup-fencing: Whether to fence unseen nodes at start-up
+      * Setting this to false may lead to a "split-brain" situation, potentially leading to data loss and/or service unavailability.
+      * Possible values: boolean (default: )
+
+  * DEPRECATED OPTIONS (will be removed in a future release):
+
+    * remove-after-stop: Whether to remove stopped resources from the executor
+      * Values other than default are poorly tested and potentially dangerous.
+      * Possible values: boolean (default: )
+=#=#=#= End test: List all available cluster options - OK (0) =#=#=#=
+* Passed: crm_attribute  - List all available cluster options
+=#=#=#= Begin test: List all available cluster options (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute --list-options=cluster --all --output-as=xml">
+  <resource-agent name="cluster-options" version="">
+    <version>1.1</version>
+    <longdesc lang="en">Also known as properties, these are options that affect behavior across the entire cluster. They are configured within cluster_property_set elements inside the crm_config subsection of the CIB configuration section.</longdesc>
+    <shortdesc lang="en">Pacemaker cluster options</shortdesc>
+    <parameters>
+      <parameter name="dc-version" advanced="0" generated="1">
+        <longdesc lang="en">Includes a hash which identifies the exact revision the code was built from. Used for diagnostic purposes.</longdesc>
+        <shortdesc lang="en">Pacemaker version on cluster node elected Designated Controller (DC)</shortdesc>
+        <content type="version"/>
+      </parameter>
+      <parameter name="cluster-infrastructure" advanced="0" generated="1">
+        <longdesc lang="en">Used for informational and diagnostic purposes.</longdesc>
+        <shortdesc lang="en">The messaging layer on which Pacemaker is currently running</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="cluster-name" advanced="0" generated="0">
+        <longdesc lang="en">This optional value is mostly for users' convenience as desired in administration, but may also be used in Pacemaker configuration rules via the #cluster-name node attribute, and by higher-level tools and resource agents.</longdesc>
+        <shortdesc lang="en">An arbitrary name for the cluster</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="dc-deadtime" advanced="0" generated="0">
+        <longdesc lang="en">The optimal value will depend on the speed and load of your network and the type of switches used.</longdesc>
+        <shortdesc lang="en">How long to wait for a response from other nodes during start-up</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="cluster-recheck-interval" advanced="0" generated="0">
+        <longdesc lang="en">Pacemaker is primarily event-driven, and looks ahead to know when to recheck cluster state for failure-timeout settings and most time-based rules. However, it will also recheck the cluster after this amount of inactivity, to evaluate rules with date specifications and serve as a fail-safe for certain types of scheduler bugs. A value of 0 disables polling. A positive value sets an interval in seconds, unless other units are specified (for example, "5min").</longdesc>
+        <shortdesc lang="en">Polling interval to recheck cluster state and evaluate rules with date specifications</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="fence-reaction" advanced="0" generated="0">
+        <longdesc lang="en">A cluster node may receive notification of a "succeeded" fencing that targeted it if fencing is misconfigured, or if fabric fencing is in use that doesn't cut cluster communication. Use "stop" to attempt to immediately stop Pacemaker and stay stopped, or "panic" to attempt to immediately reboot the local node, falling back to stop on failure.</longdesc>
+        <shortdesc lang="en">How a cluster node should react if notified of its own fencing</shortdesc>
+        <content type="select" default="">
+          <option value="stop"/>
+          <option value="panic"/>
+        </content>
+      </parameter>
+      <parameter name="election-timeout" advanced="1" generated="0">
+        <longdesc lang="en">Declare an election failed if it is not decided within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">Declare an election failed if it is not decided within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="shutdown-escalation" advanced="1" generated="0">
+        <longdesc lang="en">Exit immediately if shutdown does not complete within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">Exit immediately if shutdown does not complete within this much time. If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="join-integration-timeout" advanced="1" generated="0">
+        <longdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="join-finalization-timeout" advanced="1" generated="0">
+        <longdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</longdesc>
+        <shortdesc lang="en">If you need to adjust this value, it probably indicates the presence of a bug.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="transition-delay" advanced="1" generated="0">
+        <longdesc lang="en">Delay cluster recovery for this much time to allow for additional events to occur. Useful if your configuration is sensitive to the order in which ping updates arrive.</longdesc>
+        <shortdesc lang="en">Enabling this option will slow down cluster recovery under all conditions</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="no-quorum-policy" advanced="0" generated="0">
+        <longdesc lang="en">What to do when the cluster does not have quorum</longdesc>
+        <shortdesc lang="en">What to do when the cluster does not have quorum</shortdesc>
+        <content type="select" default="">
+          <option value="stop"/>
+          <option value="freeze"/>
+          <option value="ignore"/>
+          <option value="demote"/>
+          <option value="suicide"/>
+        </content>
+      </parameter>
+      <parameter name="shutdown-lock" advanced="0" generated="0">
+        <longdesc lang="en">When true, resources active on a node when it is cleanly shut down are kept "locked" to that node (not allowed to run elsewhere) until they start again on that node after it rejoins (or for at most shutdown-lock-limit, if set). Stonith resources and Pacemaker Remote connections are never locked. Clone and bundle instances and the promoted role of promotable clones are currently never locked, though support could be added in a future release.</longdesc>
+        <shortdesc lang="en">Whether to lock resources to a cleanly shut down node</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="shutdown-lock-limit" advanced="0" generated="0">
+        <longdesc lang="en">If shutdown-lock is true and this is set to a nonzero time duration, shutdown locks will expire after this much time has passed since the shutdown was initiated, even if the node has not rejoined.</longdesc>
+        <shortdesc lang="en">Do not lock resources to a cleanly shut down node longer than this</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="enable-acl" advanced="0" generated="0">
+        <longdesc lang="en">Enable Access Control Lists (ACLs) for the CIB</longdesc>
+        <shortdesc lang="en">Enable Access Control Lists (ACLs) for the CIB</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="symmetric-cluster" advanced="0" generated="0">
+        <longdesc lang="en">Whether resources can run on any node by default</longdesc>
+        <shortdesc lang="en">Whether resources can run on any node by default</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="maintenance-mode" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should refrain from monitoring, starting, and stopping resources</longdesc>
+        <shortdesc lang="en">Whether the cluster should refrain from monitoring, starting, and stopping resources</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="start-failure-is-fatal" advanced="0" generated="0">
+        <longdesc lang="en">When true, the cluster will immediately ban a resource from a node if it fails to start there. When false, the cluster will instead check the resource's fail count against its migration-threshold.</longdesc>
+        <shortdesc lang="en">Whether a start failure should prevent a resource from being recovered on the same node</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="enable-startup-probes" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should check for active resources during start-up</longdesc>
+        <shortdesc lang="en">Whether the cluster should check for active resources during start-up</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stonith-enabled" advanced="1" generated="0">
+        <longdesc lang="en">If false, unresponsive nodes are immediately assumed to be harmless, and resources that were active on them may be recovered elsewhere. This can result in a "split-brain" situation, potentially leading to data loss and/or service unavailability.</longdesc>
+        <shortdesc lang="en">Whether nodes may be fenced as part of recovery</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stonith-action" advanced="0" generated="0">
+        <longdesc lang="en">Action to send to fence device when a node needs to be fenced ("poweroff" is a deprecated alias for "off")</longdesc>
+        <shortdesc lang="en">Action to send to fence device when a node needs to be fenced ("poweroff" is a deprecated alias for "off")</shortdesc>
+        <content type="select" default="">
+          <option value="reboot"/>
+          <option value="off"/>
+          <option value="poweroff"/>
+        </content>
+      </parameter>
+      <parameter name="stonith-timeout" advanced="0" generated="0">
+        <longdesc lang="en">How long to wait for on, off, and reboot fence actions to complete by default</longdesc>
+        <shortdesc lang="en">How long to wait for on, off, and reboot fence actions to complete by default</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="have-watchdog" advanced="0" generated="1">
+        <longdesc lang="en">This is set automatically by the cluster according to whether SBD is detected to be in use. User-configured values are ignored. The value `true` is meaningful if diskless SBD is used and `stonith-watchdog-timeout` is nonzero. In that case, if fencing is required, watchdog-based self-fencing will be performed via SBD without requiring a fencing resource explicitly configured.</longdesc>
+        <shortdesc lang="en">Whether watchdog integration is enabled</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stonith-watchdog-timeout" advanced="0" generated="0">
+        <longdesc lang="en">If this is set to a positive value, lost nodes are assumed to achieve self-fencing using watchdog-based SBD within this much time. This does not require a fencing resource to be explicitly configured, though a fence_watchdog resource can be configured, to limit use to specific nodes. If this is set to 0 (the default), the cluster will never assume watchdog-based self-fencing. If this is set to a negative value, the cluster will use twice the local value of the `SBD_WATCHDOG_TIMEOUT` environment variable if that is positive, or otherwise treat this as 0. WARNING: When used, this timeout must be larger than `SBD_WATCHDOG_TIMEOUT` on all nodes that use watchdog-based SBD, and Pacemaker will refuse to start on any of those nodes where this is not true for the local value or SBD is not active. When this is set to a negative value, `SBD_WATCHDOG_TIMEOUT` must be set to the same value on all nodes that use SBD, otherwise data corruption or loss could occur.</longdesc>
+        <shortdesc lang="en">How long before nodes can be assumed to be safely down when watchdog-based self-fencing via SBD is in use</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="stonith-max-attempts" advanced="0" generated="0">
+        <longdesc lang="en">How many times fencing can fail before it will no longer be immediately re-attempted on a target</longdesc>
+        <shortdesc lang="en">How many times fencing can fail before it will no longer be immediately re-attempted on a target</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="concurrent-fencing" advanced="0" generated="0">
+        <longdesc lang="en">Allow performing fencing operations in parallel</longdesc>
+        <shortdesc lang="en">Allow performing fencing operations in parallel</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="startup-fencing" advanced="1" generated="0">
+        <longdesc lang="en">Setting this to false may lead to a "split-brain" situation, potentially leading to data loss and/or service unavailability.</longdesc>
+        <shortdesc lang="en">Whether to fence unseen nodes at start-up</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="priority-fencing-delay" advanced="0" generated="0">
+        <longdesc lang="en">Apply specified delay for the fencings that are targeting the lost nodes with the highest total resource priority in case we don't have the majority of the nodes in our cluster partition, so that the more significant nodes potentially win any fencing match, which is especially meaningful under split-brain of 2-node cluster. A promoted resource instance takes the base priority + 1 on calculation if the base priority is not 0. Any static/random delays that are introduced by `pcmk_delay_base/max` configured for the corresponding fencing resources will be added to this delay. This delay should be significantly greater than, safely twice, the maximum `pcmk_delay_base/max`. By default, priority fencing delay is disabled.</longdesc>
+        <shortdesc lang="en">Apply fencing delay targeting the lost nodes with the highest total resource priority</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="node-pending-timeout" advanced="0" generated="0">
+        <longdesc lang="en">Fence nodes that do not join the controller process group within this much time after joining the cluster, to allow the cluster to continue managing resources. A value of 0 means never fence pending nodes. Setting the value to 2h means fence nodes after 2 hours.</longdesc>
+        <shortdesc lang="en">How long to wait for a node that has joined the cluster to join the controller process group</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="cluster-delay" advanced="0" generated="0">
+        <longdesc lang="en">The node elected Designated Controller (DC) will consider an action failed if it does not get a response from the node executing the action within this time (after considering the action's own timeout). The "correct" value will depend on the speed and load of your network and cluster nodes.</longdesc>
+        <shortdesc lang="en">Maximum time for node-to-node communication</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="load-threshold" advanced="0" generated="0">
+        <longdesc lang="en">The cluster will slow down its recovery process when the amount of system resources used (currently CPU) approaches this limit</longdesc>
+        <shortdesc lang="en">Maximum amount of system load that should be used by cluster nodes</shortdesc>
+        <content type="percentage" default=""/>
+      </parameter>
+      <parameter name="node-action-limit" advanced="0" generated="0">
+        <longdesc lang="en">Maximum number of jobs that can be scheduled per node (defaults to 2x cores)</longdesc>
+        <shortdesc lang="en">Maximum number of jobs that can be scheduled per node (defaults to 2x cores)</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="batch-limit" advanced="0" generated="0">
+        <longdesc lang="en">The "correct" value will depend on the speed and load of your network and cluster nodes. If set to 0, the cluster will impose a dynamically calculated limit when any node has a high load.</longdesc>
+        <shortdesc lang="en">Maximum number of jobs that the cluster may execute in parallel across all nodes</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="migration-limit" advanced="0" generated="0">
+        <longdesc lang="en">The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)</longdesc>
+        <shortdesc lang="en">The number of live migration actions that the cluster is allowed to execute in parallel on a node (-1 means no limit)</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="cluster-ipc-limit" advanced="0" generated="0">
+        <longdesc lang="en">Raise this if log has "Evicting client" messages for cluster daemon PIDs (a good value is the number of resources in the cluster multiplied by the number of nodes).</longdesc>
+        <shortdesc lang="en">Maximum IPC message backlog before disconnecting a cluster daemon</shortdesc>
+        <content type="nonnegative_integer" default=""/>
+      </parameter>
+      <parameter name="stop-all-resources" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should stop all active resources</longdesc>
+        <shortdesc lang="en">Whether the cluster should stop all active resources</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stop-orphan-resources" advanced="0" generated="0">
+        <longdesc lang="en">Whether to stop resources that were removed from the configuration</longdesc>
+        <shortdesc lang="en">Whether to stop resources that were removed from the configuration</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="stop-orphan-actions" advanced="0" generated="0">
+        <longdesc lang="en">Whether to cancel recurring actions removed from the configuration</longdesc>
+        <shortdesc lang="en">Whether to cancel recurring actions removed from the configuration</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="remove-after-stop" advanced="0" generated="0">
+        <deprecated/>
+        <longdesc lang="en">Values other than default are poorly tested and potentially dangerous.</longdesc>
+        <shortdesc lang="en">Whether to remove stopped resources from the executor</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="pe-error-series-max" advanced="0" generated="0">
+        <longdesc lang="en">Zero to disable, -1 to store unlimited.</longdesc>
+        <shortdesc lang="en">The number of scheduler inputs resulting in errors to save</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pe-warn-series-max" advanced="0" generated="0">
+        <longdesc lang="en">Zero to disable, -1 to store unlimited.</longdesc>
+        <shortdesc lang="en">The number of scheduler inputs resulting in warnings to save</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pe-input-series-max" advanced="0" generated="0">
+        <longdesc lang="en">Zero to disable, -1 to store unlimited.</longdesc>
+        <shortdesc lang="en">The number of scheduler inputs without errors or warnings to save</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="node-health-strategy" advanced="0" generated="0">
+        <longdesc lang="en">Requires external entities to create node attributes (named with the prefix "#health") with values "red", "yellow", or "green".</longdesc>
+        <shortdesc lang="en">How cluster should react to node health attributes</shortdesc>
+        <content type="select" default="">
+          <option value="none"/>
+          <option value="migrate-on-red"/>
+          <option value="only-green"/>
+          <option value="progressive"/>
+          <option value="custom"/>
+        </content>
+      </parameter>
+      <parameter name="node-health-base" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "progressive".</longdesc>
+        <shortdesc lang="en">Base health score assigned to a node</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="node-health-green" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "custom" or "progressive".</longdesc>
+        <shortdesc lang="en">The score to use for a node health attribute whose value is "green"</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="node-health-yellow" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "custom" or "progressive".</longdesc>
+        <shortdesc lang="en">The score to use for a node health attribute whose value is "yellow"</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="node-health-red" advanced="0" generated="0">
+        <longdesc lang="en">Only used when "node-health-strategy" is set to "custom" or "progressive".</longdesc>
+        <shortdesc lang="en">The score to use for a node health attribute whose value is "red"</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="placement-strategy" advanced="0" generated="0">
+        <longdesc lang="en">How the cluster should allocate resources to nodes</longdesc>
+        <shortdesc lang="en">How the cluster should allocate resources to nodes</shortdesc>
+        <content type="select" default="">
+          <option value="default"/>
+          <option value="utilization"/>
+          <option value="minimal"/>
+          <option value="balanced"/>
+        </content>
+      </parameter>
+    </parameters>
+  </resource-agent>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List all available cluster options (XML) - OK (0) =#=#=#=
+* Passed: crm_attribute  - List all available cluster options (XML)
 =#=#=#= Begin test: Query the value of an attribute that does not exist =#=#=#=
 crm_attribute: Error performing operation: No such device or address
 =#=#=#= End test: Query the value of an attribute that does not exist - No such object (105) =#=#=#=
@@ -33,7 +937,7 @@ crm_attribute: Error performing operation: No such device or address
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
-        <nvpair id="cib-bootstrap-options-cluster-delay" name="cluster-delay" value="60s"/>
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="5"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
@@ -44,14 +948,230 @@ crm_attribute: Error performing operation: No such device or address
 </cib>
 =#=#=#= End test: Configure something before erasing - OK (0) =#=#=#=
 * Passed: crm_attribute  - Configure something before erasing
+=#=#=#= Begin test: Test '++' XML attribute update syntax =#=#=#=
+=#=#=#= Current cib after: Test '++' XML attribute update syntax =#=#=#=
+<cib epoch="2" num_updates="1" admin_epoch="1">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="5"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '++' XML attribute update syntax - OK (0) =#=#=#=
+* Passed: cibadmin       - Test '++' XML attribute update syntax
+=#=#=#= Begin test: Test '+=' XML attribute update syntax =#=#=#=
+=#=#=#= Current cib after: Test '+=' XML attribute update syntax =#=#=#=
+<cib epoch="2" num_updates="2" admin_epoch="3">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="5"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '+=' XML attribute update syntax - OK (0) =#=#=#=
+* Passed: cibadmin       - Test '+=' XML attribute update syntax
+=#=#=#= Begin test: Test '++' nvpair value update syntax =#=#=#=
+=#=#=#= Current cib after: Test '++' nvpair value update syntax =#=#=#=
+<cib epoch="3" num_updates="0" admin_epoch="3">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="6"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '++' nvpair value update syntax - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '++' nvpair value update syntax
+=#=#=#= Begin test: Test '++' nvpair value update syntax (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute -n test_attr -v value++ --score --output-as=xml">
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= Current cib after: Test '++' nvpair value update syntax (XML) =#=#=#=
+<cib epoch="4" num_updates="0" admin_epoch="3">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="7"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '++' nvpair value update syntax (XML) - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '++' nvpair value update syntax (XML)
+=#=#=#= Begin test: Test '+=' nvpair value update syntax =#=#=#=
+=#=#=#= Current cib after: Test '+=' nvpair value update syntax =#=#=#=
+<cib epoch="5" num_updates="0" admin_epoch="3">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="9"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '+=' nvpair value update syntax - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '+=' nvpair value update syntax
+=#=#=#= Begin test: Test '+=' nvpair value update syntax (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute -n test_attr -v value+=2 --score --output-as=xml">
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= Current cib after: Test '+=' nvpair value update syntax (XML) =#=#=#=
+<cib epoch="6" num_updates="0" admin_epoch="3">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="11"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '+=' nvpair value update syntax (XML) - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '+=' nvpair value update syntax (XML)
+=#=#=#= Begin test: Test '++' XML attribute update syntax (--score not set) =#=#=#=
+=#=#=#= Current cib after: Test '++' XML attribute update syntax (--score not set) =#=#=#=
+<cib epoch="6" num_updates="1" admin_epoch="4">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="11"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '++' XML attribute update syntax (--score not set) - OK (0) =#=#=#=
+* Passed: cibadmin       - Test '++' XML attribute update syntax (--score not set)
+=#=#=#= Begin test: Test '+=' XML attribute update syntax (--score not set) =#=#=#=
+=#=#=#= Current cib after: Test '+=' XML attribute update syntax (--score not set) =#=#=#=
+<cib epoch="6" num_updates="2" admin_epoch="6">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="11"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '+=' XML attribute update syntax (--score not set) - OK (0) =#=#=#=
+* Passed: cibadmin       - Test '+=' XML attribute update syntax (--score not set)
+=#=#=#= Begin test: Test '++' nvpair value update syntax (--score not set) =#=#=#=
+=#=#=#= Current cib after: Test '++' nvpair value update syntax (--score not set) =#=#=#=
+<cib epoch="7" num_updates="0" admin_epoch="6">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="12"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '++' nvpair value update syntax (--score not set) - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '++' nvpair value update syntax (--score not set)
+=#=#=#= Begin test: Test '++' nvpair value update syntax (--score not set) (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute -n test_attr -v value++ --output-as=xml">
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= Current cib after: Test '++' nvpair value update syntax (--score not set) (XML) =#=#=#=
+<cib epoch="8" num_updates="0" admin_epoch="6">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="13"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '++' nvpair value update syntax (--score not set) (XML) - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '++' nvpair value update syntax (--score not set) (XML)
+=#=#=#= Begin test: Test '+=' nvpair value update syntax (--score not set) =#=#=#=
+=#=#=#= Current cib after: Test '+=' nvpair value update syntax (--score not set) =#=#=#=
+<cib epoch="9" num_updates="0" admin_epoch="6">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="15"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '+=' nvpair value update syntax (--score not set) - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '+=' nvpair value update syntax (--score not set)
+=#=#=#= Begin test: Test '+=' nvpair value update syntax (--score not set) (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_attribute -n test_attr -v value+=2 --output-as=xml">
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= Current cib after: Test '+=' nvpair value update syntax (--score not set) (XML) =#=#=#=
+<cib epoch="10" num_updates="0" admin_epoch="6">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="17"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
+=#=#=#= End test: Test '+=' nvpair value update syntax (--score not set) (XML) - OK (0) =#=#=#=
+* Passed: crm_attribute  - Test '+=' nvpair value update syntax (--score not set) (XML)
 =#=#=#= Begin test: Require --force for CIB erasure =#=#=#=
 cibadmin: The supplied command is considered dangerous. To prevent accidental destruction of the cluster, the --force flag is required in order to proceed.
 =#=#=#= Current cib after: Require --force for CIB erasure =#=#=#=
-<cib epoch="2" num_updates="0" admin_epoch="0">
+<cib epoch="10" num_updates="0" admin_epoch="6">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
-        <nvpair id="cib-bootstrap-options-cluster-delay" name="cluster-delay" value="60s"/>
+        <nvpair id="cib-bootstrap-options-test_attr" name="test_attr" value="17"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
@@ -177,7 +1297,7 @@ cibadmin: The supplied command is considered dangerous. To prevent accidental de
 =#=#=#= Begin test: Create operation should fail =#=#=#=
 Call failed: File exists
 <failed>
-  <failed_update id="cib-bootstrap-options" object_type="cluster_property_set" operation="cib_create" reason="File exists">
+  <failed_update id="cib-bootstrap-options" object-type="cluster_property_set" operation="cib_create" reason="File exists">
     <cluster_property_set id="cib-bootstrap-options">
       <nvpair id="cib-bootstrap-options-cluster-delay" name="cluster-delay" value="60s"/>
     </cluster_property_set>
@@ -461,8 +1581,8 @@ Revised Cluster Status:
 =#=#=#= End test: Create second node attribute - OK (0) =#=#=#=
 * Passed: crm_attribute  - Create second node attribute
 =#=#=#= Begin test: Query node attributes by pattern =#=#=#=
-scope=nodes  name=ram value=1024M
-scope=nodes  name=rattr value=XYZ
+scope=nodes name=ram value=1024M
+scope=nodes name=rattr value=XYZ
 =#=#=#= End test: Query node attributes by pattern - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query node attributes by pattern
 =#=#=#= Begin test: Update node attributes by pattern =#=#=#=
@@ -644,8 +1764,8 @@ Current cluster status:
 =#=#=#= End test: Set a second transient node attribute - OK (0) =#=#=#=
 * Passed: crm_attribute  - Set a second transient node attribute
 =#=#=#= Begin test: Query transient node attributes by pattern =#=#=#=
-scope=status  name=fail-count-foo value=3
-scope=status  name=fail-count-bar value=5
+scope=status name=fail-count-foo value=3
+scope=status name=fail-count-bar value=5
 =#=#=#= End test: Query transient node attributes by pattern - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query transient node attributes by pattern
 =#=#=#= Begin test: Update transient node attributes by pattern =#=#=#=
@@ -757,7 +1877,7 @@ crm_attribute: Error: must specify attribute name or pattern to delete
 =#=#=#= End test: Set a utilization node attribute - OK (0) =#=#=#=
 * Passed: crm_attribute  - Set a utilization node attribute
 =#=#=#= Begin test: Query utilization node attribute =#=#=#=
-scope=nodes  name=cpu value=1
+scope=nodes name=cpu value=1
 =#=#=#= End test: Query utilization node attribute - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query utilization node attribute
 =#=#=#= Begin test: Digest calculation =#=#=#=
@@ -832,7 +1952,7 @@ Call failed: Update was older than existing configuration
 =#=#=#= End test: Replace operation should fail - Update was older than existing configuration (103) =#=#=#=
 * Passed: cibadmin       - Replace operation should fail
 =#=#=#= Begin test: Default standby value =#=#=#=
-scope=status  name=standby value=off
+scope=status name=standby value=off
 =#=#=#= Current cib after: Default standby value =#=#=#=
 <cib epoch="14" num_updates="0" admin_epoch="0">
   <configuration>
@@ -904,7 +2024,7 @@ scope=status  name=standby value=off
 =#=#=#= End test: Set standby status - OK (0) =#=#=#=
 * Passed: crm_standby    - Set standby status
 =#=#=#= Begin test: Query standby value =#=#=#=
-scope=nodes  name=standby value=true
+scope=nodes name=standby value=true
 =#=#=#= Current cib after: Query standby value =#=#=#=
 <cib epoch="15" num_updates="0" admin_epoch="0">
   <configuration>
@@ -1020,6 +2140,824 @@ crm_resource: non-option ARGV-elements:
 
 =#=#=#= End test: crm_resource run with extra arguments - Incorrect usage (64) =#=#=#=
 * Passed: crm_resource   - crm_resource run with extra arguments
+=#=#=#= Begin test: List all available resource options (invalid type) =#=#=#=
+crm_resource: Error parsing option --list-options
+=#=#=#= End test: List all available resource options (invalid type) - Incorrect usage (64) =#=#=#=
+* Passed: crm_resource   - List all available resource options (invalid type)
+=#=#=#= Begin test: List all available resource options (invalid type) (XML) =#=#=#=
+crm_resource: Error parsing option --list-options
+=#=#=#= End test: List all available resource options (invalid type) (XML) - Incorrect usage (64) =#=#=#=
+* Passed: crm_resource   - List all available resource options (invalid type) (XML)
+=#=#=#= Begin test: List non-advanced primitive meta-attributes =#=#=#=
+Primitive meta-attributes
+
+Meta-attributes applicable to primitive resources
+
+  * priority: Resource assignment priority
+    * If not all resources can be active, the cluster will stop lower-priority resources in order to keep higher-priority ones active.
+    * Possible values: score (default: )
+
+  * critical: Default value for influence in colocation constraints
+    * Use this value as the default for influence in all colocation constraints involving this resource, as well as in the implicit colocation constraints created if this resource is in a group.
+    * Possible values: boolean (default: )
+
+  * target-role: State the cluster should attempt to keep this resource in
+    * "Stopped" forces the resource to be stopped. "Started" allows the resource to be started (and in the case of promotable clone resources, promoted if appropriate). "Unpromoted" allows the resource to be started, but only in the unpromoted role if the resource is promotable. "Promoted" is equivalent to "Started".
+    * Possible values: "Stopped", "Started" (default), "Unpromoted", "Promoted"
+
+  * is-managed: Whether the cluster is allowed to actively change the resource's state
+    * If false, the cluster will not start, stop, promote, or demote the resource on any node. Recurring actions for the resource are unaffected. If true, a true value for the maintenance-mode cluster option, the maintenance node attribute, or the maintenance resource meta-attribute overrides this.
+    * Possible values: boolean (default: )
+
+  * maintenance: If true, the cluster will not schedule any actions involving the resource
+    * If true, the cluster will not start, stop, promote, or demote the resource on any node, and will pause any recurring monitors (except those specifying role as "Stopped"). If false, a true value for the maintenance-mode cluster option or maintenance node attribute overrides this.
+    * Possible values: boolean (default: )
+
+  * resource-stickiness: Score to add to the current node when a resource is already active
+    * Score to add to the current node when a resource is already active. This allows running resources to stay where they are, even if they would be placed elsewhere if they were being started from a stopped state. The default is 1 for individual clone instances, and 0 for all other resources.
+    * Possible values: score (no default)
+
+  * requires: Conditions under which the resource can be started
+    * Conditions under which the resource can be started. "nothing" means the cluster can always start this resource. "quorum" means the cluster can start this resource only if a majority of the configured nodes are active. "fencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced. "unfencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced, and only on nodes that have been unfenced. The default is "quorum" for resources with a class of stonith; otherwise, "unfencing" if unfencing is active in the cluster; otherwise, "fencing" if the stonith-enabled cluster option is true; otherwise, "quorum".
+    * Possible values: "nothing", "quorum", "fencing", "unfencing"
+
+  * migration-threshold: Number of failures on a node before the resource becomes ineligible to run there.
+    * Number of failures that may occur for this resource on a node, before that node is marked ineligible to host this resource. A value of 0 indicates that this feature is disabled (the node will never be marked ineligible). By contrast, the cluster treats "INFINITY" (the default) as a very large but finite number. This option has an effect only if the failed operation specifies its on-fail attribute as "restart" (the default), and additionally for failed start operations, if the start-failure-is-fatal cluster property is set to false.
+    * Possible values: score (default: )
+
+  * failure-timeout: Number of seconds before acting as if a failure had not occurred
+    * Number of seconds after a failed action for this resource before acting as if the failure had not occurred, and potentially allowing the resource back to the node on which it failed. A value of 0 indicates that this feature is disabled.
+    * Possible values: duration (default: )
+
+  * multiple-active: What to do if the cluster finds the resource active on more than one node
+    * What to do if the cluster finds the resource active on more than one node. "block" means to mark the resource as unmanaged. "stop_only" means to stop all active instances of this resource and leave them stopped. "stop_start" means to stop all active instances of this resource and start the resource in one location only. "stop_unexpected" means to stop all active instances of this resource except where the resource should be active. (This should be used only when extra instances are not expected to disrupt existing instances, and the resource agent's monitor of an existing instance is capable of detecting any problems that could be caused. Note that any resources ordered after this one will still need to be restarted.)
+    * Possible values: "block", "stop_only", "stop_start" (default), "stop_unexpected"
+
+  * allow-migrate: Whether the cluster should try to "live migrate" this resource when it needs to be moved
+    * Whether the cluster should try to "live migrate" this resource when it needs to be moved. The default is true for ocf:pacemaker:remote resources, and false otherwise.
+    * Possible values: boolean (no default)
+
+  * allow-unhealthy-nodes: Whether the resource should be allowed to run on a node even if the node's health score would otherwise prevent it
+    * Possible values: boolean (default: )
+
+  * container-attribute-target: Where to check user-defined node attributes
+    * Whether to check user-defined node attributes on the physical host where a container is running or on the local node. This is usually set for a bundle resource and inherited by the bundle's primitive resource. A value of "host" means to check user-defined node attributes on the underlying physical host. Any other value means to check user-defined node attributes on the local node (for a bundled primitive resource, this is the bundle node).
+    * Possible values: string (no default)
+
+  * remote-node: Name of the Pacemaker Remote guest node this resource is associated with, if any
+    * Name of the Pacemaker Remote guest node this resource is associated with, if any. If specified, this both enables the resource as a guest node and defines the unique name used to identify the guest node. The guest must be configured to run the Pacemaker Remote daemon when it is started. WARNING: This value cannot overlap with any resource or node IDs.
+    * Possible values: string (no default)
+
+  * remote-addr: If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote
+    * If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote. The Pacemaker Remote daemon on the guest must be configured to accept connections on this address. The default is the value of the remote-node meta-attribute.
+    * Possible values: string (no default)
+
+  * remote-port: If remote-node is specified, port on the guest used for its Pacemaker Remote connection
+    * If remote-node is specified, the port on the guest used for its Pacemaker Remote connection. The Pacemaker Remote daemon on the guest must be configured to listen on this port.
+    * Possible values: port (default: )
+
+  * remote-connect-timeout: If remote-node is specified, how long before a pending Pacemaker Remote guest connection times out.
+    * Possible values: timeout (default: )
+
+  * remote-allow-migrate: If remote-node is specified, this acts as the allow-migrate meta-attribute for the implicit remote connection resource (ocf:pacemaker:remote).
+    * Possible values: boolean (default: )
+=#=#=#= End test: List non-advanced primitive meta-attributes - OK (0) =#=#=#=
+* Passed: crm_resource   - List non-advanced primitive meta-attributes
+=#=#=#= Begin test: List non-advanced primitive meta-attributes (XML) (shows all) =#=#=#=
+<pacemaker-result api-version="X" request="crm_resource --list-options=primitive --output-as=xml">
+  <resource-agent name="primitive-meta" version="">
+    <version>1.1</version>
+    <longdesc lang="en">Meta-attributes applicable to primitive resources</longdesc>
+    <shortdesc lang="en">Primitive meta-attributes</shortdesc>
+    <parameters>
+      <parameter name="priority" advanced="0" generated="0">
+        <longdesc lang="en">If not all resources can be active, the cluster will stop lower-priority resources in order to keep higher-priority ones active.</longdesc>
+        <shortdesc lang="en">Resource assignment priority</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="critical" advanced="0" generated="0">
+        <longdesc lang="en">Use this value as the default for influence in all colocation constraints involving this resource, as well as in the implicit colocation constraints created if this resource is in a group.</longdesc>
+        <shortdesc lang="en">Default value for influence in colocation constraints</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="target-role" advanced="0" generated="0">
+        <longdesc lang="en">"Stopped" forces the resource to be stopped. "Started" allows the resource to be started (and in the case of promotable clone resources, promoted if appropriate). "Unpromoted" allows the resource to be started, but only in the unpromoted role if the resource is promotable. "Promoted" is equivalent to "Started".</longdesc>
+        <shortdesc lang="en">State the cluster should attempt to keep this resource in</shortdesc>
+        <content type="select" default="">
+          <option value="Stopped"/>
+          <option value="Started"/>
+          <option value="Unpromoted"/>
+          <option value="Promoted"/>
+        </content>
+      </parameter>
+      <parameter name="is-managed" advanced="0" generated="0">
+        <longdesc lang="en">If false, the cluster will not start, stop, promote, or demote the resource on any node. Recurring actions for the resource are unaffected. If true, a true value for the maintenance-mode cluster option, the maintenance node attribute, or the maintenance resource meta-attribute overrides this.</longdesc>
+        <shortdesc lang="en">Whether the cluster is allowed to actively change the resource's state</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="maintenance" advanced="0" generated="0">
+        <longdesc lang="en">If true, the cluster will not start, stop, promote, or demote the resource on any node, and will pause any recurring monitors (except those specifying role as "Stopped"). If false, a true value for the maintenance-mode cluster option or maintenance node attribute overrides this.</longdesc>
+        <shortdesc lang="en">If true, the cluster will not schedule any actions involving the resource</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="resource-stickiness" advanced="0" generated="0">
+        <longdesc lang="en">Score to add to the current node when a resource is already active. This allows running resources to stay where they are, even if they would be placed elsewhere if they were being started from a stopped state. The default is 1 for individual clone instances, and 0 for all other resources.</longdesc>
+        <shortdesc lang="en">Score to add to the current node when a resource is already active</shortdesc>
+        <content type="score"/>
+      </parameter>
+      <parameter name="requires" advanced="0" generated="0">
+        <longdesc lang="en">Conditions under which the resource can be started. "nothing" means the cluster can always start this resource. "quorum" means the cluster can start this resource only if a majority of the configured nodes are active. "fencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced. "unfencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced, and only on nodes that have been unfenced. The default is "quorum" for resources with a class of stonith; otherwise, "unfencing" if unfencing is active in the cluster; otherwise, "fencing" if the stonith-enabled cluster option is true; otherwise, "quorum".</longdesc>
+        <shortdesc lang="en">Conditions under which the resource can be started</shortdesc>
+        <content type="select">
+          <option value="nothing"/>
+          <option value="quorum"/>
+          <option value="fencing"/>
+          <option value="unfencing"/>
+        </content>
+      </parameter>
+      <parameter name="migration-threshold" advanced="0" generated="0">
+        <longdesc lang="en">Number of failures that may occur for this resource on a node, before that node is marked ineligible to host this resource. A value of 0 indicates that this feature is disabled (the node will never be marked ineligible). By contrast, the cluster treats "INFINITY" (the default) as a very large but finite number. This option has an effect only if the failed operation specifies its on-fail attribute as "restart" (the default), and additionally for failed start operations, if the start-failure-is-fatal cluster property is set to false.</longdesc>
+        <shortdesc lang="en">Number of failures on a node before the resource becomes ineligible to run there.</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="failure-timeout" advanced="0" generated="0">
+        <longdesc lang="en">Number of seconds after a failed action for this resource before acting as if the failure had not occurred, and potentially allowing the resource back to the node on which it failed. A value of 0 indicates that this feature is disabled.</longdesc>
+        <shortdesc lang="en">Number of seconds before acting as if a failure had not occurred</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="multiple-active" advanced="0" generated="0">
+        <longdesc lang="en">What to do if the cluster finds the resource active on more than one node. "block" means to mark the resource as unmanaged. "stop_only" means to stop all active instances of this resource and leave them stopped. "stop_start" means to stop all active instances of this resource and start the resource in one location only. "stop_unexpected" means to stop all active instances of this resource except where the resource should be active. (This should be used only when extra instances are not expected to disrupt existing instances, and the resource agent's monitor of an existing instance is capable of detecting any problems that could be caused. Note that any resources ordered after this one will still need to be restarted.)</longdesc>
+        <shortdesc lang="en">What to do if the cluster finds the resource active on more than one node</shortdesc>
+        <content type="select" default="">
+          <option value="block"/>
+          <option value="stop_only"/>
+          <option value="stop_start"/>
+          <option value="stop_unexpected"/>
+        </content>
+      </parameter>
+      <parameter name="allow-migrate" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should try to "live migrate" this resource when it needs to be moved. The default is true for ocf:pacemaker:remote resources, and false otherwise.</longdesc>
+        <shortdesc lang="en">Whether the cluster should try to "live migrate" this resource when it needs to be moved</shortdesc>
+        <content type="boolean"/>
+      </parameter>
+      <parameter name="allow-unhealthy-nodes" advanced="0" generated="0">
+        <longdesc lang="en">Whether the resource should be allowed to run on a node even if the node's health score would otherwise prevent it</longdesc>
+        <shortdesc lang="en">Whether the resource should be allowed to run on a node even if the node's health score would otherwise prevent it</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="container-attribute-target" advanced="0" generated="0">
+        <longdesc lang="en">Whether to check user-defined node attributes on the physical host where a container is running or on the local node. This is usually set for a bundle resource and inherited by the bundle's primitive resource. A value of "host" means to check user-defined node attributes on the underlying physical host. Any other value means to check user-defined node attributes on the local node (for a bundled primitive resource, this is the bundle node).</longdesc>
+        <shortdesc lang="en">Where to check user-defined node attributes</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="remote-node" advanced="0" generated="0">
+        <longdesc lang="en">Name of the Pacemaker Remote guest node this resource is associated with, if any. If specified, this both enables the resource as a guest node and defines the unique name used to identify the guest node. The guest must be configured to run the Pacemaker Remote daemon when it is started. WARNING: This value cannot overlap with any resource or node IDs.</longdesc>
+        <shortdesc lang="en">Name of the Pacemaker Remote guest node this resource is associated with, if any</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="remote-addr" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote. The Pacemaker Remote daemon on the guest must be configured to accept connections on this address. The default is the value of the remote-node meta-attribute.</longdesc>
+        <shortdesc lang="en">If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="remote-port" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, the port on the guest used for its Pacemaker Remote connection. The Pacemaker Remote daemon on the guest must be configured to listen on this port.</longdesc>
+        <shortdesc lang="en">If remote-node is specified, port on the guest used for its Pacemaker Remote connection</shortdesc>
+        <content type="port" default=""/>
+      </parameter>
+      <parameter name="remote-connect-timeout" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, how long before a pending Pacemaker Remote guest connection times out.</longdesc>
+        <shortdesc lang="en">If remote-node is specified, how long before a pending Pacemaker Remote guest connection times out.</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="remote-allow-migrate" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, this acts as the allow-migrate meta-attribute for the implicit remote connection resource (ocf:pacemaker:remote).</longdesc>
+        <shortdesc lang="en">If remote-node is specified, this acts as the allow-migrate meta-attribute for the implicit remote connection resource (ocf:pacemaker:remote).</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+    </parameters>
+  </resource-agent>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List non-advanced primitive meta-attributes (XML) (shows all) - OK (0) =#=#=#=
+* Passed: crm_resource   - List non-advanced primitive meta-attributes (XML) (shows all)
+=#=#=#= Begin test: List all available primitive meta-attributes =#=#=#=
+Primitive meta-attributes
+
+Meta-attributes applicable to primitive resources
+
+  * priority: Resource assignment priority
+    * If not all resources can be active, the cluster will stop lower-priority resources in order to keep higher-priority ones active.
+    * Possible values: score (default: )
+
+  * critical: Default value for influence in colocation constraints
+    * Use this value as the default for influence in all colocation constraints involving this resource, as well as in the implicit colocation constraints created if this resource is in a group.
+    * Possible values: boolean (default: )
+
+  * target-role: State the cluster should attempt to keep this resource in
+    * "Stopped" forces the resource to be stopped. "Started" allows the resource to be started (and in the case of promotable clone resources, promoted if appropriate). "Unpromoted" allows the resource to be started, but only in the unpromoted role if the resource is promotable. "Promoted" is equivalent to "Started".
+    * Possible values: "Stopped", "Started" (default), "Unpromoted", "Promoted"
+
+  * is-managed: Whether the cluster is allowed to actively change the resource's state
+    * If false, the cluster will not start, stop, promote, or demote the resource on any node. Recurring actions for the resource are unaffected. If true, a true value for the maintenance-mode cluster option, the maintenance node attribute, or the maintenance resource meta-attribute overrides this.
+    * Possible values: boolean (default: )
+
+  * maintenance: If true, the cluster will not schedule any actions involving the resource
+    * If true, the cluster will not start, stop, promote, or demote the resource on any node, and will pause any recurring monitors (except those specifying role as "Stopped"). If false, a true value for the maintenance-mode cluster option or maintenance node attribute overrides this.
+    * Possible values: boolean (default: )
+
+  * resource-stickiness: Score to add to the current node when a resource is already active
+    * Score to add to the current node when a resource is already active. This allows running resources to stay where they are, even if they would be placed elsewhere if they were being started from a stopped state. The default is 1 for individual clone instances, and 0 for all other resources.
+    * Possible values: score (no default)
+
+  * requires: Conditions under which the resource can be started
+    * Conditions under which the resource can be started. "nothing" means the cluster can always start this resource. "quorum" means the cluster can start this resource only if a majority of the configured nodes are active. "fencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced. "unfencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced, and only on nodes that have been unfenced. The default is "quorum" for resources with a class of stonith; otherwise, "unfencing" if unfencing is active in the cluster; otherwise, "fencing" if the stonith-enabled cluster option is true; otherwise, "quorum".
+    * Possible values: "nothing", "quorum", "fencing", "unfencing"
+
+  * migration-threshold: Number of failures on a node before the resource becomes ineligible to run there.
+    * Number of failures that may occur for this resource on a node, before that node is marked ineligible to host this resource. A value of 0 indicates that this feature is disabled (the node will never be marked ineligible). By contrast, the cluster treats "INFINITY" (the default) as a very large but finite number. This option has an effect only if the failed operation specifies its on-fail attribute as "restart" (the default), and additionally for failed start operations, if the start-failure-is-fatal cluster property is set to false.
+    * Possible values: score (default: )
+
+  * failure-timeout: Number of seconds before acting as if a failure had not occurred
+    * Number of seconds after a failed action for this resource before acting as if the failure had not occurred, and potentially allowing the resource back to the node on which it failed. A value of 0 indicates that this feature is disabled.
+    * Possible values: duration (default: )
+
+  * multiple-active: What to do if the cluster finds the resource active on more than one node
+    * What to do if the cluster finds the resource active on more than one node. "block" means to mark the resource as unmanaged. "stop_only" means to stop all active instances of this resource and leave them stopped. "stop_start" means to stop all active instances of this resource and start the resource in one location only. "stop_unexpected" means to stop all active instances of this resource except where the resource should be active. (This should be used only when extra instances are not expected to disrupt existing instances, and the resource agent's monitor of an existing instance is capable of detecting any problems that could be caused. Note that any resources ordered after this one will still need to be restarted.)
+    * Possible values: "block", "stop_only", "stop_start" (default), "stop_unexpected"
+
+  * allow-migrate: Whether the cluster should try to "live migrate" this resource when it needs to be moved
+    * Whether the cluster should try to "live migrate" this resource when it needs to be moved. The default is true for ocf:pacemaker:remote resources, and false otherwise.
+    * Possible values: boolean (no default)
+
+  * allow-unhealthy-nodes: Whether the resource should be allowed to run on a node even if the node's health score would otherwise prevent it
+    * Possible values: boolean (default: )
+
+  * container-attribute-target: Where to check user-defined node attributes
+    * Whether to check user-defined node attributes on the physical host where a container is running or on the local node. This is usually set for a bundle resource and inherited by the bundle's primitive resource. A value of "host" means to check user-defined node attributes on the underlying physical host. Any other value means to check user-defined node attributes on the local node (for a bundled primitive resource, this is the bundle node).
+    * Possible values: string (no default)
+
+  * remote-node: Name of the Pacemaker Remote guest node this resource is associated with, if any
+    * Name of the Pacemaker Remote guest node this resource is associated with, if any. If specified, this both enables the resource as a guest node and defines the unique name used to identify the guest node. The guest must be configured to run the Pacemaker Remote daemon when it is started. WARNING: This value cannot overlap with any resource or node IDs.
+    * Possible values: string (no default)
+
+  * remote-addr: If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote
+    * If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote. The Pacemaker Remote daemon on the guest must be configured to accept connections on this address. The default is the value of the remote-node meta-attribute.
+    * Possible values: string (no default)
+
+  * remote-port: If remote-node is specified, port on the guest used for its Pacemaker Remote connection
+    * If remote-node is specified, the port on the guest used for its Pacemaker Remote connection. The Pacemaker Remote daemon on the guest must be configured to listen on this port.
+    * Possible values: port (default: )
+
+  * remote-connect-timeout: If remote-node is specified, how long before a pending Pacemaker Remote guest connection times out.
+    * Possible values: timeout (default: )
+
+  * remote-allow-migrate: If remote-node is specified, this acts as the allow-migrate meta-attribute for the implicit remote connection resource (ocf:pacemaker:remote).
+    * Possible values: boolean (default: )
+=#=#=#= End test: List all available primitive meta-attributes - OK (0) =#=#=#=
+* Passed: crm_resource   - List all available primitive meta-attributes
+=#=#=#= Begin test: List all available primitive meta-attributes (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_resource --list-options=primitive --all --output-as=xml">
+  <resource-agent name="primitive-meta" version="">
+    <version>1.1</version>
+    <longdesc lang="en">Meta-attributes applicable to primitive resources</longdesc>
+    <shortdesc lang="en">Primitive meta-attributes</shortdesc>
+    <parameters>
+      <parameter name="priority" advanced="0" generated="0">
+        <longdesc lang="en">If not all resources can be active, the cluster will stop lower-priority resources in order to keep higher-priority ones active.</longdesc>
+        <shortdesc lang="en">Resource assignment priority</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="critical" advanced="0" generated="0">
+        <longdesc lang="en">Use this value as the default for influence in all colocation constraints involving this resource, as well as in the implicit colocation constraints created if this resource is in a group.</longdesc>
+        <shortdesc lang="en">Default value for influence in colocation constraints</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="target-role" advanced="0" generated="0">
+        <longdesc lang="en">"Stopped" forces the resource to be stopped. "Started" allows the resource to be started (and in the case of promotable clone resources, promoted if appropriate). "Unpromoted" allows the resource to be started, but only in the unpromoted role if the resource is promotable. "Promoted" is equivalent to "Started".</longdesc>
+        <shortdesc lang="en">State the cluster should attempt to keep this resource in</shortdesc>
+        <content type="select" default="">
+          <option value="Stopped"/>
+          <option value="Started"/>
+          <option value="Unpromoted"/>
+          <option value="Promoted"/>
+        </content>
+      </parameter>
+      <parameter name="is-managed" advanced="0" generated="0">
+        <longdesc lang="en">If false, the cluster will not start, stop, promote, or demote the resource on any node. Recurring actions for the resource are unaffected. If true, a true value for the maintenance-mode cluster option, the maintenance node attribute, or the maintenance resource meta-attribute overrides this.</longdesc>
+        <shortdesc lang="en">Whether the cluster is allowed to actively change the resource's state</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="maintenance" advanced="0" generated="0">
+        <longdesc lang="en">If true, the cluster will not start, stop, promote, or demote the resource on any node, and will pause any recurring monitors (except those specifying role as "Stopped"). If false, a true value for the maintenance-mode cluster option or maintenance node attribute overrides this.</longdesc>
+        <shortdesc lang="en">If true, the cluster will not schedule any actions involving the resource</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="resource-stickiness" advanced="0" generated="0">
+        <longdesc lang="en">Score to add to the current node when a resource is already active. This allows running resources to stay where they are, even if they would be placed elsewhere if they were being started from a stopped state. The default is 1 for individual clone instances, and 0 for all other resources.</longdesc>
+        <shortdesc lang="en">Score to add to the current node when a resource is already active</shortdesc>
+        <content type="score"/>
+      </parameter>
+      <parameter name="requires" advanced="0" generated="0">
+        <longdesc lang="en">Conditions under which the resource can be started. "nothing" means the cluster can always start this resource. "quorum" means the cluster can start this resource only if a majority of the configured nodes are active. "fencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced. "unfencing" means the cluster can start this resource only if a majority of the configured nodes are active and any failed or unknown nodes have been fenced, and only on nodes that have been unfenced. The default is "quorum" for resources with a class of stonith; otherwise, "unfencing" if unfencing is active in the cluster; otherwise, "fencing" if the stonith-enabled cluster option is true; otherwise, "quorum".</longdesc>
+        <shortdesc lang="en">Conditions under which the resource can be started</shortdesc>
+        <content type="select">
+          <option value="nothing"/>
+          <option value="quorum"/>
+          <option value="fencing"/>
+          <option value="unfencing"/>
+        </content>
+      </parameter>
+      <parameter name="migration-threshold" advanced="0" generated="0">
+        <longdesc lang="en">Number of failures that may occur for this resource on a node, before that node is marked ineligible to host this resource. A value of 0 indicates that this feature is disabled (the node will never be marked ineligible). By contrast, the cluster treats "INFINITY" (the default) as a very large but finite number. This option has an effect only if the failed operation specifies its on-fail attribute as "restart" (the default), and additionally for failed start operations, if the start-failure-is-fatal cluster property is set to false.</longdesc>
+        <shortdesc lang="en">Number of failures on a node before the resource becomes ineligible to run there.</shortdesc>
+        <content type="score" default=""/>
+      </parameter>
+      <parameter name="failure-timeout" advanced="0" generated="0">
+        <longdesc lang="en">Number of seconds after a failed action for this resource before acting as if the failure had not occurred, and potentially allowing the resource back to the node on which it failed. A value of 0 indicates that this feature is disabled.</longdesc>
+        <shortdesc lang="en">Number of seconds before acting as if a failure had not occurred</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="multiple-active" advanced="0" generated="0">
+        <longdesc lang="en">What to do if the cluster finds the resource active on more than one node. "block" means to mark the resource as unmanaged. "stop_only" means to stop all active instances of this resource and leave them stopped. "stop_start" means to stop all active instances of this resource and start the resource in one location only. "stop_unexpected" means to stop all active instances of this resource except where the resource should be active. (This should be used only when extra instances are not expected to disrupt existing instances, and the resource agent's monitor of an existing instance is capable of detecting any problems that could be caused. Note that any resources ordered after this one will still need to be restarted.)</longdesc>
+        <shortdesc lang="en">What to do if the cluster finds the resource active on more than one node</shortdesc>
+        <content type="select" default="">
+          <option value="block"/>
+          <option value="stop_only"/>
+          <option value="stop_start"/>
+          <option value="stop_unexpected"/>
+        </content>
+      </parameter>
+      <parameter name="allow-migrate" advanced="0" generated="0">
+        <longdesc lang="en">Whether the cluster should try to "live migrate" this resource when it needs to be moved. The default is true for ocf:pacemaker:remote resources, and false otherwise.</longdesc>
+        <shortdesc lang="en">Whether the cluster should try to "live migrate" this resource when it needs to be moved</shortdesc>
+        <content type="boolean"/>
+      </parameter>
+      <parameter name="allow-unhealthy-nodes" advanced="0" generated="0">
+        <longdesc lang="en">Whether the resource should be allowed to run on a node even if the node's health score would otherwise prevent it</longdesc>
+        <shortdesc lang="en">Whether the resource should be allowed to run on a node even if the node's health score would otherwise prevent it</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+      <parameter name="container-attribute-target" advanced="0" generated="0">
+        <longdesc lang="en">Whether to check user-defined node attributes on the physical host where a container is running or on the local node. This is usually set for a bundle resource and inherited by the bundle's primitive resource. A value of "host" means to check user-defined node attributes on the underlying physical host. Any other value means to check user-defined node attributes on the local node (for a bundled primitive resource, this is the bundle node).</longdesc>
+        <shortdesc lang="en">Where to check user-defined node attributes</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="remote-node" advanced="0" generated="0">
+        <longdesc lang="en">Name of the Pacemaker Remote guest node this resource is associated with, if any. If specified, this both enables the resource as a guest node and defines the unique name used to identify the guest node. The guest must be configured to run the Pacemaker Remote daemon when it is started. WARNING: This value cannot overlap with any resource or node IDs.</longdesc>
+        <shortdesc lang="en">Name of the Pacemaker Remote guest node this resource is associated with, if any</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="remote-addr" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote. The Pacemaker Remote daemon on the guest must be configured to accept connections on this address. The default is the value of the remote-node meta-attribute.</longdesc>
+        <shortdesc lang="en">If remote-node is specified, the IP address or hostname used to connect to the guest via Pacemaker Remote</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="remote-port" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, the port on the guest used for its Pacemaker Remote connection. The Pacemaker Remote daemon on the guest must be configured to listen on this port.</longdesc>
+        <shortdesc lang="en">If remote-node is specified, port on the guest used for its Pacemaker Remote connection</shortdesc>
+        <content type="port" default=""/>
+      </parameter>
+      <parameter name="remote-connect-timeout" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, how long before a pending Pacemaker Remote guest connection times out.</longdesc>
+        <shortdesc lang="en">If remote-node is specified, how long before a pending Pacemaker Remote guest connection times out.</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="remote-allow-migrate" advanced="0" generated="0">
+        <longdesc lang="en">If remote-node is specified, this acts as the allow-migrate meta-attribute for the implicit remote connection resource (ocf:pacemaker:remote).</longdesc>
+        <shortdesc lang="en">If remote-node is specified, this acts as the allow-migrate meta-attribute for the implicit remote connection resource (ocf:pacemaker:remote).</shortdesc>
+        <content type="boolean" default=""/>
+      </parameter>
+    </parameters>
+  </resource-agent>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List all available primitive meta-attributes (XML) - OK (0) =#=#=#=
+* Passed: crm_resource   - List all available primitive meta-attributes (XML)
+=#=#=#= Begin test: List non-advanced fencing parameters =#=#=#=
+Fencing resource common parameters
+
+Special parameters that are available for all fencing resources, regardless of type. They are processed by Pacemaker, rather than by the fence agent or the fencing library.
+
+  * pcmk_host_map: A mapping of node names to port numbers for devices that do not support node names.
+    * For example, "node1:1;node2:2,3" would tell the cluster to use port 1 for node1 and ports 2 and 3 for node2.
+    * Possible values: string (no default)
+
+  * pcmk_host_list: Nodes targeted by this device
+    * Comma-separated list of nodes that can be targeted by this device (for example, "node1,node2,node3"). If pcmk_host_check is "static-list", either this or pcmk_host_map must be set.
+    * Possible values: string (no default)
+
+  * pcmk_host_check: How to determine which nodes can be targeted by the device
+    * Use "dynamic-list" to query the device via the 'list' command; "static-list" to check the pcmk_host_list attribute; "status" to query the device via the 'status' command; or "none" to assume every device can fence every node. The default value is "static-list" if pcmk_host_map or pcmk_host_list is set; otherwise "dynamic-list" if the device supports the list operation; otherwise "status" if the device supports the status operation; otherwise "none"
+    * Possible values: "dynamic-list", "static-list", "status", "none"
+
+  * pcmk_delay_max: Enable a delay of no more than the time specified before executing fencing actions.
+    * Enable a delay of no more than the time specified before executing fencing actions. Pacemaker derives the overall delay by taking the value of pcmk_delay_base and adding a random delay value such that the sum is kept below this maximum.
+    * Possible values: duration (default: )
+
+  * pcmk_delay_base: Enable a base delay for fencing actions and specify base delay value.
+    * This enables a static delay for fencing actions, which can help avoid "death matches" where two nodes try to fence each other at the same time. If pcmk_delay_max is also used, a random delay will be added such that the total delay is kept below that value. This can be set to a single time value to apply to any node targeted by this device (useful if a separate device is configured for each target), or to a node map (for example, "node1:1s;node2:5") to set a different value for each target.
+    * Possible values: string (default: )
+
+  * pcmk_action_limit: The maximum number of actions can be performed in parallel on this device
+    * Cluster property concurrent-fencing="true" needs to be configured first. Then use this to specify the maximum number of actions can be performed in parallel on this device. A value of -1 means an unlimited number of actions can be performed in parallel.
+    * Possible values: integer (default: )
+=#=#=#= End test: List non-advanced fencing parameters - OK (0) =#=#=#=
+* Passed: crm_resource   - List non-advanced fencing parameters
+=#=#=#= Begin test: List non-advanced fencing parameters (XML) (shows all) =#=#=#=
+<pacemaker-result api-version="X" request="crm_resource --list-options=fencing --output-as=xml">
+  <resource-agent name="fence-attributes" version="">
+    <version>1.1</version>
+    <longdesc lang="en">Special parameters that are available for all fencing resources, regardless of type. They are processed by Pacemaker, rather than by the fence agent or the fencing library.</longdesc>
+    <shortdesc lang="en">Fencing resource common parameters</shortdesc>
+    <parameters>
+      <parameter name="pcmk_host_argument" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard 'port' parameter or may provide additional ones. Use this to specify an alternate, device-specific, parameter that should indicate the machine to be fenced. A value of "none" can be used to tell the cluster not to supply any additional parameters.</longdesc>
+        <shortdesc lang="en">An alternate parameter to supply instead of 'port'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_host_map" advanced="0" generated="0">
+        <longdesc lang="en">For example, "node1:1;node2:2,3" would tell the cluster to use port 1 for node1 and ports 2 and 3 for node2.</longdesc>
+        <shortdesc lang="en">A mapping of node names to port numbers for devices that do not support node names.</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="pcmk_host_list" advanced="0" generated="0">
+        <longdesc lang="en">Comma-separated list of nodes that can be targeted by this device (for example, "node1,node2,node3"). If pcmk_host_check is "static-list", either this or pcmk_host_map must be set.</longdesc>
+        <shortdesc lang="en">Nodes targeted by this device</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="pcmk_host_check" advanced="0" generated="0">
+        <longdesc lang="en">Use "dynamic-list" to query the device via the 'list' command; "static-list" to check the pcmk_host_list attribute; "status" to query the device via the 'status' command; or "none" to assume every device can fence every node. The default value is "static-list" if pcmk_host_map or pcmk_host_list is set; otherwise "dynamic-list" if the device supports the list operation; otherwise "status" if the device supports the status operation; otherwise "none"</longdesc>
+        <shortdesc lang="en">How to determine which nodes can be targeted by the device</shortdesc>
+        <content type="select">
+          <option value="dynamic-list"/>
+          <option value="static-list"/>
+          <option value="status"/>
+          <option value="none"/>
+        </content>
+      </parameter>
+      <parameter name="pcmk_delay_max" advanced="0" generated="0">
+        <longdesc lang="en">Enable a delay of no more than the time specified before executing fencing actions. Pacemaker derives the overall delay by taking the value of pcmk_delay_base and adding a random delay value such that the sum is kept below this maximum.</longdesc>
+        <shortdesc lang="en">Enable a delay of no more than the time specified before executing fencing actions.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="pcmk_delay_base" advanced="0" generated="0">
+        <longdesc lang="en">This enables a static delay for fencing actions, which can help avoid "death matches" where two nodes try to fence each other at the same time. If pcmk_delay_max is also used, a random delay will be added such that the total delay is kept below that value. This can be set to a single time value to apply to any node targeted by this device (useful if a separate device is configured for each target), or to a node map (for example, "node1:1s;node2:5") to set a different value for each target.</longdesc>
+        <shortdesc lang="en">Enable a base delay for fencing actions and specify base delay value.</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_action_limit" advanced="0" generated="0">
+        <longdesc lang="en">Cluster property concurrent-fencing="true" needs to be configured first. Then use this to specify the maximum number of actions can be performed in parallel on this device. A value of -1 means an unlimited number of actions can be performed in parallel.</longdesc>
+        <shortdesc lang="en">The maximum number of actions can be performed in parallel on this device</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_reboot_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'reboot' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'reboot'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_reboot_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'reboot' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'reboot' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_reboot_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'reboot' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'reboot' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_off_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'off' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'off'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_off_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'off' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'off' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_off_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'off' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'off' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_on_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'on' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'on'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_on_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'on' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'on' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_on_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'on' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'on' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_list_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'list' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'list'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_list_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'list' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'list' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_list_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'list' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'list' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_monitor_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'monitor' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'monitor'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_monitor_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'monitor' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'monitor' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_monitor_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'monitor' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'monitor' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_status_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'status' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'status'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_status_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'status' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'status' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_status_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'status' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'status' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+    </parameters>
+  </resource-agent>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List non-advanced fencing parameters (XML) (shows all) - OK (0) =#=#=#=
+* Passed: crm_resource   - List non-advanced fencing parameters (XML) (shows all)
+=#=#=#= Begin test: List all available fencing parameters =#=#=#=
+Fencing resource common parameters
+
+Special parameters that are available for all fencing resources, regardless of type. They are processed by Pacemaker, rather than by the fence agent or the fencing library.
+
+  * pcmk_host_map: A mapping of node names to port numbers for devices that do not support node names.
+    * For example, "node1:1;node2:2,3" would tell the cluster to use port 1 for node1 and ports 2 and 3 for node2.
+    * Possible values: string (no default)
+
+  * pcmk_host_list: Nodes targeted by this device
+    * Comma-separated list of nodes that can be targeted by this device (for example, "node1,node2,node3"). If pcmk_host_check is "static-list", either this or pcmk_host_map must be set.
+    * Possible values: string (no default)
+
+  * pcmk_host_check: How to determine which nodes can be targeted by the device
+    * Use "dynamic-list" to query the device via the 'list' command; "static-list" to check the pcmk_host_list attribute; "status" to query the device via the 'status' command; or "none" to assume every device can fence every node. The default value is "static-list" if pcmk_host_map or pcmk_host_list is set; otherwise "dynamic-list" if the device supports the list operation; otherwise "status" if the device supports the status operation; otherwise "none"
+    * Possible values: "dynamic-list", "static-list", "status", "none"
+
+  * pcmk_delay_max: Enable a delay of no more than the time specified before executing fencing actions.
+    * Enable a delay of no more than the time specified before executing fencing actions. Pacemaker derives the overall delay by taking the value of pcmk_delay_base and adding a random delay value such that the sum is kept below this maximum.
+    * Possible values: duration (default: )
+
+  * pcmk_delay_base: Enable a base delay for fencing actions and specify base delay value.
+    * This enables a static delay for fencing actions, which can help avoid "death matches" where two nodes try to fence each other at the same time. If pcmk_delay_max is also used, a random delay will be added such that the total delay is kept below that value. This can be set to a single time value to apply to any node targeted by this device (useful if a separate device is configured for each target), or to a node map (for example, "node1:1s;node2:5") to set a different value for each target.
+    * Possible values: string (default: )
+
+  * pcmk_action_limit: The maximum number of actions can be performed in parallel on this device
+    * Cluster property concurrent-fencing="true" needs to be configured first. Then use this to specify the maximum number of actions can be performed in parallel on this device. A value of -1 means an unlimited number of actions can be performed in parallel.
+    * Possible values: integer (default: )
+
+  * ADVANCED OPTIONS:
+
+    * pcmk_host_argument: An alternate parameter to supply instead of 'port'
+      * Some devices do not support the standard 'port' parameter or may provide additional ones. Use this to specify an alternate, device-specific, parameter that should indicate the machine to be fenced. A value of "none" can be used to tell the cluster not to supply any additional parameters.
+      * Possible values: string (default: )
+
+    * pcmk_reboot_action: An alternate command to run instead of 'reboot'
+      * Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'reboot' action.
+      * Possible values: string (default: )
+
+    * pcmk_reboot_timeout: Specify an alternate timeout to use for 'reboot' actions instead of stonith-timeout
+      * Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'reboot' actions.
+      * Possible values: timeout (default: )
+
+    * pcmk_reboot_retries: The maximum number of times to try the 'reboot' command within the timeout period
+      * Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'reboot' action before giving up.
+      * Possible values: integer (default: )
+
+    * pcmk_off_action: An alternate command to run instead of 'off'
+      * Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'off' action.
+      * Possible values: string (default: )
+
+    * pcmk_off_timeout: Specify an alternate timeout to use for 'off' actions instead of stonith-timeout
+      * Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'off' actions.
+      * Possible values: timeout (default: )
+
+    * pcmk_off_retries: The maximum number of times to try the 'off' command within the timeout period
+      * Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'off' action before giving up.
+      * Possible values: integer (default: )
+
+    * pcmk_on_action: An alternate command to run instead of 'on'
+      * Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'on' action.
+      * Possible values: string (default: )
+
+    * pcmk_on_timeout: Specify an alternate timeout to use for 'on' actions instead of stonith-timeout
+      * Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'on' actions.
+      * Possible values: timeout (default: )
+
+    * pcmk_on_retries: The maximum number of times to try the 'on' command within the timeout period
+      * Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'on' action before giving up.
+      * Possible values: integer (default: )
+
+    * pcmk_list_action: An alternate command to run instead of 'list'
+      * Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'list' action.
+      * Possible values: string (default: )
+
+    * pcmk_list_timeout: Specify an alternate timeout to use for 'list' actions instead of stonith-timeout
+      * Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'list' actions.
+      * Possible values: timeout (default: )
+
+    * pcmk_list_retries: The maximum number of times to try the 'list' command within the timeout period
+      * Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'list' action before giving up.
+      * Possible values: integer (default: )
+
+    * pcmk_monitor_action: An alternate command to run instead of 'monitor'
+      * Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'monitor' action.
+      * Possible values: string (default: )
+
+    * pcmk_monitor_timeout: Specify an alternate timeout to use for 'monitor' actions instead of stonith-timeout
+      * Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'monitor' actions.
+      * Possible values: timeout (default: )
+
+    * pcmk_monitor_retries: The maximum number of times to try the 'monitor' command within the timeout period
+      * Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'monitor' action before giving up.
+      * Possible values: integer (default: )
+
+    * pcmk_status_action: An alternate command to run instead of 'status'
+      * Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'status' action.
+      * Possible values: string (default: )
+
+    * pcmk_status_timeout: Specify an alternate timeout to use for 'status' actions instead of stonith-timeout
+      * Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'status' actions.
+      * Possible values: timeout (default: )
+
+    * pcmk_status_retries: The maximum number of times to try the 'status' command within the timeout period
+      * Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'status' action before giving up.
+      * Possible values: integer (default: )
+=#=#=#= End test: List all available fencing parameters - OK (0) =#=#=#=
+* Passed: crm_resource   - List all available fencing parameters
+=#=#=#= Begin test: List all available fencing parameters (XML) =#=#=#=
+<pacemaker-result api-version="X" request="crm_resource --list-options=fencing --all --output-as=xml">
+  <resource-agent name="fence-attributes" version="">
+    <version>1.1</version>
+    <longdesc lang="en">Special parameters that are available for all fencing resources, regardless of type. They are processed by Pacemaker, rather than by the fence agent or the fencing library.</longdesc>
+    <shortdesc lang="en">Fencing resource common parameters</shortdesc>
+    <parameters>
+      <parameter name="pcmk_host_argument" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard 'port' parameter or may provide additional ones. Use this to specify an alternate, device-specific, parameter that should indicate the machine to be fenced. A value of "none" can be used to tell the cluster not to supply any additional parameters.</longdesc>
+        <shortdesc lang="en">An alternate parameter to supply instead of 'port'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_host_map" advanced="0" generated="0">
+        <longdesc lang="en">For example, "node1:1;node2:2,3" would tell the cluster to use port 1 for node1 and ports 2 and 3 for node2.</longdesc>
+        <shortdesc lang="en">A mapping of node names to port numbers for devices that do not support node names.</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="pcmk_host_list" advanced="0" generated="0">
+        <longdesc lang="en">Comma-separated list of nodes that can be targeted by this device (for example, "node1,node2,node3"). If pcmk_host_check is "static-list", either this or pcmk_host_map must be set.</longdesc>
+        <shortdesc lang="en">Nodes targeted by this device</shortdesc>
+        <content type="string"/>
+      </parameter>
+      <parameter name="pcmk_host_check" advanced="0" generated="0">
+        <longdesc lang="en">Use "dynamic-list" to query the device via the 'list' command; "static-list" to check the pcmk_host_list attribute; "status" to query the device via the 'status' command; or "none" to assume every device can fence every node. The default value is "static-list" if pcmk_host_map or pcmk_host_list is set; otherwise "dynamic-list" if the device supports the list operation; otherwise "status" if the device supports the status operation; otherwise "none"</longdesc>
+        <shortdesc lang="en">How to determine which nodes can be targeted by the device</shortdesc>
+        <content type="select">
+          <option value="dynamic-list"/>
+          <option value="static-list"/>
+          <option value="status"/>
+          <option value="none"/>
+        </content>
+      </parameter>
+      <parameter name="pcmk_delay_max" advanced="0" generated="0">
+        <longdesc lang="en">Enable a delay of no more than the time specified before executing fencing actions. Pacemaker derives the overall delay by taking the value of pcmk_delay_base and adding a random delay value such that the sum is kept below this maximum.</longdesc>
+        <shortdesc lang="en">Enable a delay of no more than the time specified before executing fencing actions.</shortdesc>
+        <content type="duration" default=""/>
+      </parameter>
+      <parameter name="pcmk_delay_base" advanced="0" generated="0">
+        <longdesc lang="en">This enables a static delay for fencing actions, which can help avoid "death matches" where two nodes try to fence each other at the same time. If pcmk_delay_max is also used, a random delay will be added such that the total delay is kept below that value. This can be set to a single time value to apply to any node targeted by this device (useful if a separate device is configured for each target), or to a node map (for example, "node1:1s;node2:5") to set a different value for each target.</longdesc>
+        <shortdesc lang="en">Enable a base delay for fencing actions and specify base delay value.</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_action_limit" advanced="0" generated="0">
+        <longdesc lang="en">Cluster property concurrent-fencing="true" needs to be configured first. Then use this to specify the maximum number of actions can be performed in parallel on this device. A value of -1 means an unlimited number of actions can be performed in parallel.</longdesc>
+        <shortdesc lang="en">The maximum number of actions can be performed in parallel on this device</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_reboot_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'reboot' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'reboot'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_reboot_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'reboot' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'reboot' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_reboot_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'reboot' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'reboot' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_off_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'off' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'off'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_off_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'off' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'off' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_off_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'off' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'off' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_on_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'on' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'on'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_on_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'on' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'on' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_on_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'on' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'on' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_list_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'list' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'list'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_list_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'list' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'list' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_list_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'list' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'list' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_monitor_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'monitor' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'monitor'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_monitor_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'monitor' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'monitor' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_monitor_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'monitor' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'monitor' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+      <parameter name="pcmk_status_action" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support the standard commands or may provide additional ones. Use this to specify an alternate, device-specific, command that implements the 'status' action.</longdesc>
+        <shortdesc lang="en">An alternate command to run instead of 'status'</shortdesc>
+        <content type="string" default=""/>
+      </parameter>
+      <parameter name="pcmk_status_timeout" advanced="1" generated="0">
+        <longdesc lang="en">Some devices need much more/less time to complete than normal. Use this to specify an alternate, device-specific, timeout for 'status' actions.</longdesc>
+        <shortdesc lang="en">Specify an alternate timeout to use for 'status' actions instead of stonith-timeout</shortdesc>
+        <content type="timeout" default=""/>
+      </parameter>
+      <parameter name="pcmk_status_retries" advanced="1" generated="0">
+        <longdesc lang="en">Some devices do not support multiple connections. Operations may "fail" if the device is busy with another task. In that case, Pacemaker will automatically retry the operation if there is time remaining. Use this option to alter the number of times Pacemaker tries a 'status' action before giving up.</longdesc>
+        <shortdesc lang="en">The maximum number of times to try the 'status' command within the timeout period</shortdesc>
+        <content type="integer" default=""/>
+      </parameter>
+    </parameters>
+  </resource-agent>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List all available fencing parameters (XML) - OK (0) =#=#=#=
+* Passed: crm_resource   - List all available fencing parameters (XML)
 =#=#=#= Begin test: crm_resource given both -r and resource config =#=#=#=
 crm_resource: --resource cannot be used with --class, --agent, and --provider
 =#=#=#= End test: crm_resource given both -r and resource config - Incorrect usage (64) =#=#=#=
@@ -1166,6 +3104,13 @@ unpack_resources 	error: Resource start-up disabled since no STONITH resources h
 unpack_resources 	error: Either configure some or disable STONITH with the stonith-enabled option
 unpack_resources 	error: NOTE: Clusters with shared data need STONITH to ensure data integrity
 <pacemaker-result api-version="X" request="crm_resource -r dummy --meta -p target-role -v Stopped --output-as=xml">
+  <resource-settings>
+    <primitive id="dummy">
+      <meta_attributes id="dummy-meta_attributes">
+        <nvpair id="dummy-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+  </resource-settings>
   <status code="0" message="OK"/>
 </pacemaker-result>
 =#=#=#= End test: Create another resource meta attribute - OK (0) =#=#=#=
@@ -2083,7 +4028,7 @@ Error performing operation: No such object
 * Passed: crm_resource   - Try to move a resource that doesn't exist
 =#=#=#= Begin test: Move a resource from its existing location =#=#=#=
 WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score of -INFINITY for resource dummy on node1.
-	This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool
+	This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool.
 	This will be the case even if node1 is the last node in the cluster
 =#=#=#= Current cib after: Move a resource from its existing location =#=#=#=
 <cib epoch="28" num_updates="0" admin_epoch="0">
@@ -2303,6 +4248,34 @@ false
 </cib>
 =#=#=#= End test: Set ticket granted state - OK (0) =#=#=#=
 * Passed: crm_ticket     - Set ticket granted state
+=#=#=#= Begin test: List ticket IDs =#=#=#=
+ticketA
+=#=#=#= End test: List ticket IDs - OK (0) =#=#=#=
+* Passed: crm_ticket     - List ticket IDs
+=#=#=#= Begin test: List ticket IDs, outputting in XML =#=#=#=
+<pacemaker-result api-version="X" request="crm_ticket -w --output-as=xml">
+  <tickets>
+    <ticket id="ticketA" status="revoked" standby="false" granted="false"/>
+  </tickets>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List ticket IDs, outputting in XML - OK (0) =#=#=#=
+* Passed: crm_ticket     - List ticket IDs, outputting in XML
+=#=#=#= Begin test: Query ticket state =#=#=#=
+State XML:
+
+<ticket_state id="ticketA" granted="false"/>
+=#=#=#= End test: Query ticket state - OK (0) =#=#=#=
+* Passed: crm_ticket     - Query ticket state
+=#=#=#= Begin test: Query ticket state, outputting as xml =#=#=#=
+<pacemaker-result api-version="X" request="crm_ticket -t ticketA -q --output-as=xml">
+  <tickets>
+    <ticket id="ticketA" granted="false"/>
+  </tickets>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: Query ticket state, outputting as xml - OK (0) =#=#=#=
+* Passed: crm_ticket     - Query ticket state, outputting as xml
 =#=#=#= Begin test: Query ticket granted state =#=#=#=
 false
 =#=#=#= Current cib after: Query ticket granted state =#=#=#=
@@ -2360,6 +4333,17 @@ false
 </cib>
 =#=#=#= End test: Query ticket granted state - OK (0) =#=#=#=
 * Passed: crm_ticket     - Query ticket granted state
+=#=#=#= Begin test: Query ticket granted state, outputting as xml =#=#=#=
+<pacemaker-result api-version="X" request="crm_ticket -t ticketA -G granted --output-as=xml">
+  <tickets>
+    <ticket id="ticketA">
+      <attribute name="granted" value="false"/>
+    </ticket>
+  </tickets>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: Query ticket granted state, outputting as xml - OK (0) =#=#=#=
+* Passed: crm_ticket     - Query ticket granted state, outputting as xml
 =#=#=#= Begin test: Delete ticket granted state =#=#=#=
 =#=#=#= Current cib after: Delete ticket granted state =#=#=#=
 <cib epoch="29" num_updates="2" admin_epoch="0">
@@ -2585,9 +4569,207 @@ true
 </cib>
 =#=#=#= End test: Activate a ticket - OK (0) =#=#=#=
 * Passed: crm_ticket     - Activate a ticket
+=#=#=#= Begin test: List ticket details =#=#=#=
+ticketA	revoked	(standby=false)
+=#=#=#= End test: List ticket details - OK (0) =#=#=#=
+* Passed: crm_ticket     - List ticket details
+=#=#=#= Begin test: List ticket details, outputting as XML =#=#=#=
+<pacemaker-result api-version="X" request="crm_ticket -L -t ticketA --output-as=xml">
+  <tickets>
+    <ticket id="ticketA" status="revoked" standby="false"/>
+  </tickets>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List ticket details, outputting as XML - OK (0) =#=#=#=
+* Passed: crm_ticket     - List ticket details, outputting as XML
+=#=#=#= Begin test: Add a second ticket =#=#=#=
+false
+=#=#=#= Current cib after: Add a second ticket =#=#=#=
+<cib epoch="29" num_updates="4" admin_epoch="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
+      </cluster_property_set>
+      <cluster_property_set id="duplicate">
+        <nvpair id="duplicate-cluster-delay" name="cluster-delay" value="30s"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="node1" uname="node1">
+        <instance_attributes id="nodes-node1">
+          <nvpair id="nodes-node1-ram" name="ram" value="1024M"/>
+        </instance_attributes>
+        <utilization id="nodes-node1-utilization">
+          <nvpair id="nodes-node1-utilization-cpu" name="cpu" value="1"/>
+        </utilization>
+      </node>
+    </nodes>
+    <resources>
+      <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+        <meta_attributes id="dummy-meta_attributes"/>
+        <instance_attributes id="dummy-instance_attributes">
+          <nvpair id="dummy-instance_attributes-delay" name="delay" value="10s"/>
+        </instance_attributes>
+      </primitive>
+      <primitive id="Fence" class="stonith" type="fence_true"/>
+    </resources>
+    <constraints/>
+  </configuration>
+  <status>
+    <node_state id="node1" uname="node1" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate">
+      <transient_attributes id="node1">
+        <instance_attributes id="status-node1"/>
+      </transient_attributes>
+      <lrm id="node1">
+        <lrm_resources>
+          <lrm_resource id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+            <lrm_rsc_op id="dummy_last_0" operation_key="dummy_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="0830891652dabe627ca72b8e879199b1"/>
+          </lrm_resource>
+          <lrm_resource id="Fence" class="stonith" type="fence_true">
+            <lrm_rsc_op id="Fence_last_0" operation_key="Fence_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <tickets>
+      <ticket_state id="ticketA" standby="false"/>
+    </tickets>
+  </status>
+</cib>
+=#=#=#= End test: Add a second ticket - OK (0) =#=#=#=
+* Passed: crm_ticket     - Add a second ticket
+=#=#=#= Begin test: Set second ticket granted state =#=#=#=
+=#=#=#= Current cib after: Set second ticket granted state =#=#=#=
+<cib epoch="29" num_updates="5" admin_epoch="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
+      </cluster_property_set>
+      <cluster_property_set id="duplicate">
+        <nvpair id="duplicate-cluster-delay" name="cluster-delay" value="30s"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="node1" uname="node1">
+        <instance_attributes id="nodes-node1">
+          <nvpair id="nodes-node1-ram" name="ram" value="1024M"/>
+        </instance_attributes>
+        <utilization id="nodes-node1-utilization">
+          <nvpair id="nodes-node1-utilization-cpu" name="cpu" value="1"/>
+        </utilization>
+      </node>
+    </nodes>
+    <resources>
+      <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+        <meta_attributes id="dummy-meta_attributes"/>
+        <instance_attributes id="dummy-instance_attributes">
+          <nvpair id="dummy-instance_attributes-delay" name="delay" value="10s"/>
+        </instance_attributes>
+      </primitive>
+      <primitive id="Fence" class="stonith" type="fence_true"/>
+    </resources>
+    <constraints/>
+  </configuration>
+  <status>
+    <node_state id="node1" uname="node1" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate">
+      <transient_attributes id="node1">
+        <instance_attributes id="status-node1"/>
+      </transient_attributes>
+      <lrm id="node1">
+        <lrm_resources>
+          <lrm_resource id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+            <lrm_rsc_op id="dummy_last_0" operation_key="dummy_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="0830891652dabe627ca72b8e879199b1"/>
+          </lrm_resource>
+          <lrm_resource id="Fence" class="stonith" type="fence_true">
+            <lrm_rsc_op id="Fence_last_0" operation_key="Fence_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <tickets>
+      <ticket_state id="ticketA" standby="false"/>
+      <ticket_state id="ticketB" granted="false"/>
+    </tickets>
+  </status>
+</cib>
+=#=#=#= End test: Set second ticket granted state - OK (0) =#=#=#=
+* Passed: crm_ticket     - Set second ticket granted state
+=#=#=#= Begin test: List tickets =#=#=#=
+ticketA	revoked
+ticketB	revoked
+=#=#=#= End test: List tickets - OK (0) =#=#=#=
+* Passed: crm_ticket     - List tickets
+=#=#=#= Begin test: List tickets, outputting as XML =#=#=#=
+<pacemaker-result api-version="X" request="crm_ticket -l --output-as=xml">
+  <tickets>
+    <ticket id="ticketA" status="revoked" standby="false"/>
+    <ticket id="ticketB" status="revoked" standby="false" granted="false"/>
+  </tickets>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: List tickets, outputting as XML - OK (0) =#=#=#=
+* Passed: crm_ticket     - List tickets, outputting as XML
+=#=#=#= Begin test: Delete second ticket =#=#=#=
+=#=#=#= Current cib after: Delete second ticket =#=#=#=
+<cib epoch="29" num_updates="6" admin_epoch="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
+      </cluster_property_set>
+      <cluster_property_set id="duplicate">
+        <nvpair id="duplicate-cluster-delay" name="cluster-delay" value="30s"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="node1" uname="node1">
+        <instance_attributes id="nodes-node1">
+          <nvpair id="nodes-node1-ram" name="ram" value="1024M"/>
+        </instance_attributes>
+        <utilization id="nodes-node1-utilization">
+          <nvpair id="nodes-node1-utilization-cpu" name="cpu" value="1"/>
+        </utilization>
+      </node>
+    </nodes>
+    <resources>
+      <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+        <meta_attributes id="dummy-meta_attributes"/>
+        <instance_attributes id="dummy-instance_attributes">
+          <nvpair id="dummy-instance_attributes-delay" name="delay" value="10s"/>
+        </instance_attributes>
+      </primitive>
+      <primitive id="Fence" class="stonith" type="fence_true"/>
+    </resources>
+    <constraints/>
+  </configuration>
+  <status>
+    <node_state id="node1" uname="node1" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate">
+      <transient_attributes id="node1">
+        <instance_attributes id="status-node1"/>
+      </transient_attributes>
+      <lrm id="node1">
+        <lrm_resources>
+          <lrm_resource id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+            <lrm_rsc_op id="dummy_last_0" operation_key="dummy_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="0830891652dabe627ca72b8e879199b1"/>
+          </lrm_resource>
+          <lrm_resource id="Fence" class="stonith" type="fence_true">
+            <lrm_rsc_op id="Fence_last_0" operation_key="Fence_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <tickets>
+      <ticket_state id="ticketA" standby="false"/>
+    </tickets>
+  </status>
+</cib>
+=#=#=#= End test: Delete second ticket - OK (0) =#=#=#=
+* Passed: cibadmin       - Delete second ticket
 =#=#=#= Begin test: Delete ticket standby state =#=#=#=
 =#=#=#= Current cib after: Delete ticket standby state =#=#=#=
-<cib epoch="29" num_updates="5" admin_epoch="0">
+<cib epoch="29" num_updates="7" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -2641,11 +4823,147 @@ true
 </cib>
 =#=#=#= End test: Delete ticket standby state - OK (0) =#=#=#=
 * Passed: crm_ticket     - Delete ticket standby state
+=#=#=#= Begin test: Delete ticket standby state =#=#=#=
+=#=#=#= Current cib after: Delete ticket standby state =#=#=#=
+<cib epoch="30" num_updates="0" admin_epoch="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
+      </cluster_property_set>
+      <cluster_property_set id="duplicate">
+        <nvpair id="duplicate-cluster-delay" name="cluster-delay" value="30s"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="node1" uname="node1">
+        <instance_attributes id="nodes-node1">
+          <nvpair id="nodes-node1-ram" name="ram" value="1024M"/>
+        </instance_attributes>
+        <utilization id="nodes-node1-utilization">
+          <nvpair id="nodes-node1-utilization-cpu" name="cpu" value="1"/>
+        </utilization>
+      </node>
+    </nodes>
+    <resources>
+      <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+        <meta_attributes id="dummy-meta_attributes"/>
+        <instance_attributes id="dummy-instance_attributes">
+          <nvpair id="dummy-instance_attributes-delay" name="delay" value="10s"/>
+        </instance_attributes>
+      </primitive>
+      <primitive id="Fence" class="stonith" type="fence_true"/>
+    </resources>
+    <constraints>
+      <rsc_ticket id="dummy-dep-ticketA" rsc="dummy" rsc-role="Started" ticket="ticketA" loss-policy="freeze"/>
+    </constraints>
+  </configuration>
+  <status>
+    <node_state id="node1" uname="node1" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate">
+      <transient_attributes id="node1">
+        <instance_attributes id="status-node1"/>
+      </transient_attributes>
+      <lrm id="node1">
+        <lrm_resources>
+          <lrm_resource id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+            <lrm_rsc_op id="dummy_last_0" operation_key="dummy_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="0830891652dabe627ca72b8e879199b1"/>
+          </lrm_resource>
+          <lrm_resource id="Fence" class="stonith" type="fence_true">
+            <lrm_rsc_op id="Fence_last_0" operation_key="Fence_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <tickets>
+      <ticket_state id="ticketA"/>
+    </tickets>
+  </status>
+</cib>
+=#=#=#= End test: Delete ticket standby state - OK (0) =#=#=#=
+* Passed: cibadmin       - Delete ticket standby state
+=#=#=#= Begin test: Query ticket constraints =#=#=#=
+Constraints XML:
+
+<rsc_ticket id="dummy-dep-ticketA" rsc="dummy" rsc-role="Started" ticket="ticketA" loss-policy="freeze"/>
+=#=#=#= End test: Query ticket constraints - OK (0) =#=#=#=
+* Passed: crm_ticket     - Query ticket constraints
+=#=#=#= Begin test: Query ticket constraints, outputting as xml =#=#=#=
+<pacemaker-result api-version="X" request="crm_ticket -t ticketA -c --output-as=xml">
+  <tickets>
+    <ticket id="ticketA">
+      <constraints>
+        <rsc_ticket id="dummy-dep-ticketA" rsc="dummy" rsc-role="Started" ticket="ticketA" loss-policy="freeze"/>
+      </constraints>
+    </ticket>
+  </tickets>
+  <resources>
+    <resource id="dummy"/>
+  </resources>
+  <status code="0" message="OK"/>
+</pacemaker-result>
+=#=#=#= End test: Query ticket constraints, outputting as xml - OK (0) =#=#=#=
+* Passed: crm_ticket     - Query ticket constraints, outputting as xml
+=#=#=#= Begin test: Delete ticket constraint =#=#=#=
+=#=#=#= Current cib after: Delete ticket constraint =#=#=#=
+<cib epoch="31" num_updates="0" admin_epoch="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
+      </cluster_property_set>
+      <cluster_property_set id="duplicate">
+        <nvpair id="duplicate-cluster-delay" name="cluster-delay" value="30s"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="node1" uname="node1">
+        <instance_attributes id="nodes-node1">
+          <nvpair id="nodes-node1-ram" name="ram" value="1024M"/>
+        </instance_attributes>
+        <utilization id="nodes-node1-utilization">
+          <nvpair id="nodes-node1-utilization-cpu" name="cpu" value="1"/>
+        </utilization>
+      </node>
+    </nodes>
+    <resources>
+      <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+        <meta_attributes id="dummy-meta_attributes"/>
+        <instance_attributes id="dummy-instance_attributes">
+          <nvpair id="dummy-instance_attributes-delay" name="delay" value="10s"/>
+        </instance_attributes>
+      </primitive>
+      <primitive id="Fence" class="stonith" type="fence_true"/>
+    </resources>
+    <constraints/>
+  </configuration>
+  <status>
+    <node_state id="node1" uname="node1" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate">
+      <transient_attributes id="node1">
+        <instance_attributes id="status-node1"/>
+      </transient_attributes>
+      <lrm id="node1">
+        <lrm_resources>
+          <lrm_resource id="dummy" class="ocf" provider="pacemaker" type="Dummy">
+            <lrm_rsc_op id="dummy_last_0" operation_key="dummy_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="0830891652dabe627ca72b8e879199b1"/>
+          </lrm_resource>
+          <lrm_resource id="Fence" class="stonith" type="fence_true">
+            <lrm_rsc_op id="Fence_last_0" operation_key="Fence_start_0" operation="start" crm-debug-origin="crm_simulate" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" exit-reason="" call-id="2" rc-code="0" op-status="0" interval="0" exec-time="0" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <tickets>
+      <ticket_state id="ticketA"/>
+    </tickets>
+  </status>
+</cib>
+=#=#=#= End test: Delete ticket constraint - OK (0) =#=#=#=
+* Passed: cibadmin       - Delete ticket constraint
 =#=#=#= Begin test: Ban a resource on unknown node =#=#=#=
 crm_resource: Node 'host1' not found
 Error performing operation: No such object
 =#=#=#= Current cib after: Ban a resource on unknown node =#=#=#=
-<cib epoch="29" num_updates="5" admin_epoch="0">
+<cib epoch="31" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -2731,7 +5049,7 @@ Revised Cluster Status:
     * dummy	(ocf:pacemaker:Dummy):	 Started node1
     * Fence	(stonith:fence_true):	 Started node2
 =#=#=#= Current cib after: Create two more nodes and bring them online =#=#=#=
-<cib epoch="31" num_updates="8" admin_epoch="0">
+<cib epoch="33" num_updates="8" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -2813,10 +5131,10 @@ Revised Cluster Status:
 * Passed: crm_simulate   - Create two more nodes and bring them online
 =#=#=#= Begin test: Ban dummy from node1 =#=#=#=
 WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score of -INFINITY for resource dummy on node1.
-	This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool
+	This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool.
 	This will be the case even if node1 is the last node in the cluster
 =#=#=#= Current cib after: Ban dummy from node1 =#=#=#=
-<cib epoch="32" num_updates="0" admin_epoch="0">
+<cib epoch="34" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -2912,7 +5230,7 @@ Locations:
   <status code="0" message="OK"/>
 </pacemaker-result>
 =#=#=#= Current cib after: Ban dummy from node2 =#=#=#=
-<cib epoch="33" num_updates="0" admin_epoch="0">
+<cib epoch="35" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3019,7 +5337,7 @@ Revised Cluster Status:
     * dummy	(ocf:pacemaker:Dummy):	 Started node3
     * Fence	(stonith:fence_true):	 Started node2
 =#=#=#= Current cib after: Relocate resources due to ban =#=#=#=
-<cib epoch="33" num_updates="2" admin_epoch="0">
+<cib epoch="35" num_updates="2" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3107,7 +5425,7 @@ Revised Cluster Status:
   <status code="0" message="OK"/>
 </pacemaker-result>
 =#=#=#= Current cib after: Move dummy to node1 =#=#=#=
-<cib epoch="35" num_updates="0" admin_epoch="0">
+<cib epoch="37" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3193,7 +5511,7 @@ Revised Cluster Status:
 =#=#=#= Begin test: Clear implicit constraints for dummy on node2 =#=#=#=
 Removing constraint: cli-ban-dummy-on-node2
 =#=#=#= Current cib after: Clear implicit constraints for dummy on node2 =#=#=#=
-<cib epoch="36" num_updates="0" admin_epoch="0">
+<cib epoch="38" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3285,7 +5603,7 @@ Removing constraint: cli-ban-dummy-on-node2
 Performing update of 'is-managed' on 'test-clone', the parent of 'test-primitive'
 Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone-meta_attributes name=is-managed value=false
 =#=#=#= Current cib after: Create a resource meta attribute =#=#=#=
-<cib epoch="38" num_updates="0" admin_epoch="0">
+<cib epoch="40" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3333,7 +5651,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone
 =#=#=#= Begin test: Create a resource meta attribute in the primitive =#=#=#=
 Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=test-primitive-meta_attributes name=is-managed value=false
 =#=#=#= Current cib after: Create a resource meta attribute in the primitive =#=#=#=
-<cib epoch="39" num_updates="0" admin_epoch="0">
+<cib epoch="41" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3390,7 +5708,7 @@ Multiple attributes match name=is-managed
 A value for 'is-managed' already exists in child 'test-primitive', performing update on that instead of 'test-clone'
 Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed value=true
 =#=#=#= Current cib after: Update resource meta attribute with duplicates =#=#=#=
-<cib epoch="40" num_updates="0" admin_epoch="0">
+<cib epoch="42" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3442,7 +5760,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i
 =#=#=#= Begin test: Update resource meta attribute with duplicates (force clone) =#=#=#=
 Set 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-managed value=true
 =#=#=#= Current cib after: Update resource meta attribute with duplicates (force clone) =#=#=#=
-<cib epoch="41" num_updates="0" admin_epoch="0">
+<cib epoch="43" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3498,7 +5816,7 @@ Multiple attributes match name=is-managed
 
 Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed value=false
 =#=#=#= Current cib after: Update child resource meta attribute with duplicates =#=#=#=
-<cib epoch="42" num_updates="0" admin_epoch="0">
+<cib epoch="44" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3555,7 +5873,7 @@ Multiple attributes match name=is-managed
 A value for 'is-managed' already exists in child 'test-primitive', performing delete on that instead of 'test-clone'
 Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed
 =#=#=#= Current cib after: Delete resource meta attribute with duplicates =#=#=#=
-<cib epoch="43" num_updates="0" admin_epoch="0">
+<cib epoch="45" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3606,7 +5924,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na
 Performing delete of 'is-managed' on 'test-clone', the parent of 'test-primitive'
 Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-managed
 =#=#=#= Current cib after: Delete resource meta attribute in parent =#=#=#=
-<cib epoch="44" num_updates="0" admin_epoch="0">
+<cib epoch="46" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3654,7 +5972,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma
 =#=#=#= Begin test: Create a resource meta attribute in the primitive =#=#=#=
 Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=test-primitive-meta_attributes name=is-managed value=false
 =#=#=#= Current cib after: Create a resource meta attribute in the primitive =#=#=#=
-<cib epoch="45" num_updates="0" admin_epoch="0">
+<cib epoch="47" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3705,7 +6023,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=te
 A value for 'is-managed' already exists in child 'test-primitive', performing update on that instead of 'test-clone'
 Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed value=true
 =#=#=#= Current cib after: Update existing resource meta attribute =#=#=#=
-<cib epoch="46" num_updates="0" admin_epoch="0">
+<cib epoch="48" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3755,7 +6073,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i
 =#=#=#= Begin test: Create a resource meta attribute in the parent =#=#=#=
 Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone-meta_attributes name=is-managed value=true
 =#=#=#= Current cib after: Create a resource meta attribute in the parent =#=#=#=
-<cib epoch="47" num_updates="0" admin_epoch="0">
+<cib epoch="49" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3810,7 +6128,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone
 =#=#=#= Begin test: Delete resource parent meta attribute (force) =#=#=#=
 Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-managed
 =#=#=#= Current cib after: Delete resource parent meta attribute (force) =#=#=#=
-<cib epoch="48" num_updates="0" admin_epoch="0">
+<cib epoch="50" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3859,7 +6177,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma
 * Passed: crm_resource   - Delete resource parent meta attribute (force)
 =#=#=#= Begin test: Restore duplicates =#=#=#=
 =#=#=#= Current cib after: Restore duplicates =#=#=#=
-<cib epoch="49" num_updates="0" admin_epoch="0">
+<cib epoch="51" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3915,7 +6233,7 @@ Multiple attributes match name=is-managed
 
 Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed
 =#=#=#= Current cib after: Delete resource child meta attribute =#=#=#=
-<cib epoch="50" num_updates="0" admin_epoch="0">
+<cib epoch="52" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -3964,7 +6282,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na
 * Passed: crm_resource   - Delete resource child meta attribute
 =#=#=#= Begin test: Create the dummy-group resource group =#=#=#=
 =#=#=#= Current cib after: Create the dummy-group resource group =#=#=#=
-<cib epoch="51" num_updates="0" admin_epoch="0">
+<cib epoch="53" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4018,7 +6336,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na
 =#=#=#= Begin test: Create a resource meta attribute in dummy1 =#=#=#=
 Set 'dummy1' option: id=dummy1-meta_attributes-is-managed set=dummy1-meta_attributes name=is-managed value=true
 =#=#=#= Current cib after: Create a resource meta attribute in dummy1 =#=#=#=
-<cib epoch="52" num_updates="0" admin_epoch="0">
+<cib epoch="54" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4077,7 +6395,7 @@ Set 'dummy1' option: id=dummy1-meta_attributes-is-managed set=dummy1-meta_attrib
 Set 'dummy1' option: id=dummy1-meta_attributes-is-managed name=is-managed value=false
 Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-group-meta_attributes name=is-managed value=false
 =#=#=#= Current cib after: Create a resource meta attribute in dummy-group =#=#=#=
-<cib epoch="54" num_updates="0" admin_epoch="0">
+<cib epoch="56" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4137,7 +6455,7 @@ Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-gr
 * Passed: crm_resource   - Create a resource meta attribute in dummy-group
 =#=#=#= Begin test: Delete the dummy-group resource group =#=#=#=
 =#=#=#= Current cib after: Delete the dummy-group resource group =#=#=#=
-<cib epoch="55" num_updates="0" admin_epoch="0">
+<cib epoch="57" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4187,7 +6505,7 @@ Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-gr
 =#=#=#= Begin test: Specify a lifetime when moving a resource =#=#=#=
 Migration will take effect until:
 =#=#=#= Current cib after: Specify a lifetime when moving a resource =#=#=#=
-<cib epoch="57" num_updates="0" admin_epoch="0">
+<cib epoch="59" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4241,7 +6559,7 @@ Migration will take effect until:
 * Passed: crm_resource   - Specify a lifetime when moving a resource
 =#=#=#= Begin test: Try to move a resource previously moved with a lifetime =#=#=#=
 =#=#=#= Current cib after: Try to move a resource previously moved with a lifetime =#=#=#=
-<cib epoch="59" num_updates="0" admin_epoch="0">
+<cib epoch="61" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4291,10 +6609,10 @@ Migration will take effect until:
 =#=#=#= Begin test: Ban dummy from node1 for a short time =#=#=#=
 Migration will take effect until:
 WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score of -INFINITY for resource dummy on node1.
-	This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool
+	This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool.
 	This will be the case even if node1 is the last node in the cluster
 =#=#=#= Current cib after: Ban dummy from node1 for a short time =#=#=#=
-<cib epoch="60" num_updates="0" admin_epoch="0">
+<cib epoch="62" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4350,7 +6668,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score
 =#=#=#= Begin test: Remove expired constraints =#=#=#=
 Removing constraint: cli-ban-dummy-on-node1
 =#=#=#= Current cib after: Remove expired constraints =#=#=#=
-<cib epoch="61" num_updates="0" admin_epoch="0">
+<cib epoch="63" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4400,7 +6718,7 @@ Removing constraint: cli-ban-dummy-on-node1
 =#=#=#= Begin test: Clear all implicit constraints for dummy =#=#=#=
 Removing constraint: cli-prefer-dummy
 =#=#=#= Current cib after: Clear all implicit constraints for dummy =#=#=#=
-<cib epoch="62" num_updates="0" admin_epoch="0">
+<cib epoch="64" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4447,7 +6765,7 @@ Removing constraint: cli-prefer-dummy
 * Passed: crm_resource   - Clear all implicit constraints for dummy
 =#=#=#= Begin test: Set a node health strategy =#=#=#=
 =#=#=#= Current cib after: Set a node health strategy =#=#=#=
-<cib epoch="63" num_updates="0" admin_epoch="0">
+<cib epoch="65" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4495,7 +6813,7 @@ Removing constraint: cli-prefer-dummy
 * Passed: crm_attribute  - Set a node health strategy
 =#=#=#= Begin test: Set a node health attribute =#=#=#=
 =#=#=#= Current cib after: Set a node health attribute =#=#=#=
-<cib epoch="64" num_updates="0" admin_epoch="0">
+<cib epoch="66" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4556,7 +6874,7 @@ Removing constraint: cli-prefer-dummy
 * Passed: crm_resource   - Show why a resource is not running on an unhealthy node
 =#=#=#= Begin test: Delete a resource =#=#=#=
 =#=#=#= Current cib after: Delete a resource =#=#=#=
-<cib epoch="65" num_updates="0" admin_epoch="0">
+<cib epoch="67" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
@@ -4609,8 +6927,8 @@ Removing constraint: cli-prefer-dummy
   <change operation="delete" path="/cib/configuration/comment" position="0"/>
   <change operation="delete" path="/cib/configuration/comment" position="1"/>
   <change operation="delete" path="/cib/configuration/resources/comment" position="0"/>
-  <change operation="delete" path="/cib/configuration/resources/primitive[@id=&apos;Fencing&apos;]/operations/op[@id=&apos;Fencing-start-0&apos;]"/>
-  <change operation="modify" path="/cib/configuration/crm_config/cluster_property_set[@id=&apos;cib-bootstrap-options&apos;]/nvpair[@id=&apos;cib-bootstrap-options-cluster-name&apos;]">
+  <change operation="delete" path="/cib/configuration/resources/primitive[@id='Fencing']/operations/op[@id='Fencing-start-0']"/>
+  <change operation="modify" path="/cib/configuration/crm_config/cluster_property_set[@id='cib-bootstrap-options']/nvpair[@id='cib-bootstrap-options-cluster-name']">
     <change-list>
       <change-attr name="value" operation="set" value="mycluster"/>
       <change-attr name="name" operation="set" value="cluster-name"/>
@@ -4628,7 +6946,7 @@ Removing constraint: cli-prefer-dummy
   <change operation="create" path="/cib/configuration/resources" position="0">
     <!-- test: modify this comment to say something different -->
   </change>
-  <change operation="modify" path="/cib/configuration/resources/primitive[@id=&apos;Fencing&apos;]/instance_attributes[@id=&apos;Fencing-params&apos;]/nvpair[@id=&apos;Fencing-pcmk_host_list&apos;]">
+  <change operation="modify" path="/cib/configuration/resources/primitive[@id='Fencing']/instance_attributes[@id='Fencing-params']/nvpair[@id='Fencing-pcmk_host_list']">
     <change-list>
       <change-attr name="value" operation="set" value="node1 node2 node3 node4"/>
     </change-list>
@@ -4636,7 +6954,7 @@ Removing constraint: cli-prefer-dummy
       <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3 node4"/>
     </change-result>
   </change>
-  <change operation="modify" path="/cib/configuration/resources/primitive[@id=&apos;Fencing&apos;]/operations/op[@id=&apos;Fencing-monitor-120s&apos;]">
+  <change operation="modify" path="/cib/configuration/resources/primitive[@id='Fencing']/operations/op[@id='Fencing-monitor-120s']">
     <change-list>
       <change-attr name="timeout" operation="set" value="120s"/>
       <change-attr name="name" operation="set" value="monitor"/>
@@ -4645,9 +6963,9 @@ Removing constraint: cli-prefer-dummy
       <op id="Fencing-monitor-120s" interval="120s" timeout="120s" name="monitor"/>
     </change-result>
   </change>
-  <change operation="move" path="/cib/configuration/resources/primitive[@id=&apos;dummy&apos;]/instance_attributes[@id=&apos;dummy-params&apos;]/nvpair[@id=&apos;dummy-op_sleep&apos;]" position="1"/>
-  <change operation="move" path="/cib/configuration/resources/primitive[@id=&apos;dummy&apos;]/instance_attributes[@id=&apos;dummy-params&apos;]/nvpair[@id=&apos;dummy-fake&apos;]" position="2"/>
-  <change operation="modify" path="/cib/configuration/resources/primitive[@id=&apos;dummy&apos;]/operations/op[@id=&apos;dummy-monitor-5s&apos;]">
+  <change operation="move" path="/cib/configuration/resources/primitive[@id='dummy']/instance_attributes[@id='dummy-params']/nvpair[@id='dummy-op_sleep']" position="1"/>
+  <change operation="move" path="/cib/configuration/resources/primitive[@id='dummy']/instance_attributes[@id='dummy-params']/nvpair[@id='dummy-fake']" position="2"/>
+  <change operation="modify" path="/cib/configuration/resources/primitive[@id='dummy']/operations/op[@id='dummy-monitor-5s']">
     <change-list>
       <change-attr name="name" operation="set" value="monitor"/>
       <change-attr name="timeout" operation="unset"/>
@@ -5225,11 +7543,36 @@ Resources colocated with gr2:
 A new shadow instance was created. To begin using it, enter the following into your shell:
 	export CIB_shadow=cts-cli
 =#=#=#= Begin test: Set a meta-attribute for primitive and resources colocated with it =#=#=#=
-Set 'prim5' option: id=prim5-meta_attributes-target-role set=prim5-meta_attributes name=target-role value=Stopped
-Set 'prim4' option: id=prim4-meta_attributes-target-role set=prim4-meta_attributes name=target-role value=Stopped
-Set 'prim10' option: id=prim10-meta_attributes-target-role set=prim10-meta_attributes name=target-role value=Stopped
-Set 'prim3' option: id=prim3-meta_attributes-target-role set=prim3-meta_attributes name=target-role value=Stopped
-Set 'prim2' option: id=prim2-meta_attributes-target-role set=prim2-meta_attributes name=target-role value=Stopped
+<pacemaker-result api-version="X" request="crm_resource -r prim5 --meta --set-parameter=target-role -v Stopped --recursive --output-as=xml">
+  <resource-settings>
+    <primitive id="prim5">
+      <meta_attributes id="prim5-meta_attributes">
+        <nvpair id="prim5-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+    <primitive id="prim4">
+      <meta_attributes id="prim4-meta_attributes">
+        <nvpair id="prim4-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+    <primitive id="prim10">
+      <meta_attributes id="prim10-meta_attributes">
+        <nvpair id="prim10-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+    <primitive id="prim3">
+      <meta_attributes id="prim3-meta_attributes">
+        <nvpair id="prim3-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+    <primitive id="prim2">
+      <meta_attributes id="prim2-meta_attributes">
+        <nvpair id="prim2-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+  </resource-settings>
+  <status code="0" message="OK"/>
+</pacemaker-result>
 =#=#=#= End test: Set a meta-attribute for primitive and resources colocated with it - OK (0) =#=#=#=
 * Passed: crm_resource   - Set a meta-attribute for primitive and resources colocated with it
 =#=#=#= Begin test: Set a meta-attribute for group and resource colocated with it =#=#=#=
@@ -5238,8 +7581,21 @@ Set 'prim7' option: id=prim7-meta_attributes-target-role set=prim7-meta_attribut
 =#=#=#= End test: Set a meta-attribute for group and resource colocated with it - OK (0) =#=#=#=
 * Passed: crm_resource   - Set a meta-attribute for group and resource colocated with it
 =#=#=#= Begin test: Set a meta-attribute for clone and resource colocated with it =#=#=#=
-Set 'clone' option: id=clone-meta_attributes-target-role set=clone-meta_attributes name=target-role value=Stopped
-Set 'prim9' option: id=prim9-meta_attributes-target-role set=prim9-meta_attributes name=target-role value=Stopped
+<pacemaker-result api-version="X" request="crm_resource -r clone --meta --set-parameter=target-role -v Stopped --recursive --output-as=xml">
+  <resource-settings>
+    <clone id="clone">
+      <meta_attributes id="clone-meta_attributes">
+        <nvpair id="clone-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </clone>
+    <primitive id="prim9">
+      <meta_attributes id="prim9-meta_attributes">
+        <nvpair id="prim9-meta_attributes-target-role" value="Stopped" name="target-role"/>
+      </meta_attributes>
+    </primitive>
+  </resource-settings>
+  <status code="0" message="OK"/>
+</pacemaker-result>
 =#=#=#= End test: Set a meta-attribute for clone and resource colocated with it - OK (0) =#=#=#=
 * Passed: crm_resource   - Set a meta-attribute for clone and resource colocated with it
 =#=#=#= Begin test: Show resource digests =#=#=#=
@@ -5705,7 +8061,7 @@ Started: [ cluster01 cluster02 ]
 Promoted: [ cluster02 ]
 Unpromoted: [ cluster01 ]
 
-Only 'private' parameters to 60s-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4
+Only 'private' parameters to 1m-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4
 Original: cluster01 capacity:
 Original: cluster02 capacity:
 Original: httpd-bundle-0 capacity:
@@ -5774,7 +8130,7 @@ Current cluster status:
 
 Performing Requested Modifications:
   * Injecting ping_monitor_10000@cluster02=1 into the configuration
-  * Injecting attribute fail-count-ping#monitor_10000=value++ into /node_state '2'
+  * Injecting attribute fail-count-ping#monitor_10000=1 into /node_state '2'
   * Injecting attribute last-failure-ping#monitor_10000= into /node_state '2'
 
 Transition Summary:
@@ -6142,7 +8498,7 @@ crm_attribute: Error performing operation: No such device or address
 =#=#=#= End test: Update a nonexistent promotable score attribute (XML) - OK (0) =#=#=#=
 * Passed: crm_attribute  - Update a nonexistent promotable score attribute (XML)
 =#=#=#= Begin test: Query after updating a nonexistent promotable score attribute =#=#=#=
-scope=status  name=master-promotable-rsc value=1
+scope=status name=master-promotable-rsc value=1
 =#=#=#= End test: Query after updating a nonexistent promotable score attribute - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query after updating a nonexistent promotable score attribute
 =#=#=#= Begin test: Query after updating a nonexistent promotable score attribute (XML) =#=#=#=
@@ -6162,7 +8518,7 @@ scope=status  name=master-promotable-rsc value=1
 =#=#=#= End test: Update an existing promotable score attribute (XML) - OK (0) =#=#=#=
 * Passed: crm_attribute  - Update an existing promotable score attribute (XML)
 =#=#=#= Begin test: Query after updating an existing promotable score attribute =#=#=#=
-scope=status  name=master-promotable-rsc value=5
+scope=status name=master-promotable-rsc value=5
 =#=#=#= End test: Query after updating an existing promotable score attribute - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query after updating an existing promotable score attribute
 =#=#=#= Begin test: Query after updating an existing promotable score attribute (XML) =#=#=#=
@@ -6206,7 +8562,7 @@ crm_attribute: Error performing operation: No such device or address
 =#=#=#= End test: Update a promotable score attribute to -INFINITY (XML) - OK (0) =#=#=#=
 * Passed: crm_attribute  - Update a promotable score attribute to -INFINITY (XML)
 =#=#=#= Begin test: Query after updating a promotable score attribute to -INFINITY =#=#=#=
-scope=status  name=master-promotable-rsc value=-INFINITY
+scope=status name=master-promotable-rsc value=-INFINITY
 =#=#=#= End test: Query after updating a promotable score attribute to -INFINITY - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query after updating a promotable score attribute to -INFINITY
 =#=#=#= Begin test: Query after updating a promotable score attribute to -INFINITY (XML) =#=#=#=
@@ -6217,7 +8573,7 @@ scope=status  name=master-promotable-rsc value=-INFINITY
 =#=#=#= End test: Query after updating a promotable score attribute to -INFINITY (XML) - OK (0) =#=#=#=
 * Passed: crm_attribute  - Query after updating a promotable score attribute to -INFINITY (XML)
 =#=#=#= Begin test: Try OCF_RESOURCE_INSTANCE if -p is specified with an empty string =#=#=#=
-scope=status  name=master-promotable-rsc value=-INFINITY
+scope=status name=master-promotable-rsc value=-INFINITY
 =#=#=#= End test: Try OCF_RESOURCE_INSTANCE if -p is specified with an empty string - OK (0) =#=#=#=
 * Passed: crm_attribute  - Try OCF_RESOURCE_INSTANCE if -p is specified with an empty string
 =#=#=#= Begin test: Return usage error if both -p and OCF_RESOURCE_INSTANCE are empty strings =#=#=#=
@@ -7048,7 +9404,7 @@ Diff: +++ 1.4.1 (null)
       <cib epoch="4" num_updates="1" admin_epoch="1"/>
     </change-result>
   </change>
-  <change operation="modify" path="/cib/configuration/resources/primitive[@id=&apos;dummy&apos;]">
+  <change operation="modify" path="/cib/configuration/resources/primitive[@id='dummy']">
     <change-list>
       <change-attr name="description" operation="set" value="desc"/>
     </change-list>
@@ -7667,7 +10023,7 @@ Diff: +++ 0.1.0 (null)
 -- /cib/status/node_state[@id='1']
 -- /cib/status/node_state[@id='httpd-bundle-0']
 -- /cib/status/node_state[@id='httpd-bundle-1']
-+  /cib:  @crm_feature_set=3.19.0, @num_updates=0, @admin_epoch=0
++  /cib:  @validate-with=pacemaker-X, @num_updates=0, @admin_epoch=0
 -- /cib:  @cib-last-written, @update-origin, @update-client, @update-user, @have-quorum, @dc-uuid
 =#=#=#= End test: Get active shadow instance's diff (empty CIB) - Error occurred (1) =#=#=#=
 * Passed: crm_shadow     - Get active shadow instance's diff (empty CIB)
@@ -7679,29 +10035,30 @@ Diff: +++ 0.1.0 (null)
     <source admin_epoch="1" epoch="1" num_updates="173"/>
     <target admin_epoch="0" epoch="1" num_updates="0"/>
   </version>
-  <change operation="delete" path="/cib/configuration/crm_config/cluster_property_set[@id=&apos;cib-bootstrap-options&apos;]"/>
-  <change operation="delete" path="/cib/configuration/nodes/node[@id=&apos;1&apos;]"/>
-  <change operation="delete" path="/cib/configuration/nodes/node[@id=&apos;2&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/clone[@id=&apos;ping-clone&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/primitive[@id=&apos;Fencing&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/primitive[@id=&apos;dummy&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/clone[@id=&apos;inactive-clone&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/group[@id=&apos;inactive-group&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/bundle[@id=&apos;httpd-bundle&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/group[@id=&apos;exim-group&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/clone[@id=&apos;mysql-clone-group&apos;]"/>
-  <change operation="delete" path="/cib/configuration/resources/clone[@id=&apos;promotable-clone&apos;]"/>
-  <change operation="delete" path="/cib/configuration/constraints/rsc_location[@id=&apos;not-on-cluster1&apos;]"/>
-  <change operation="delete" path="/cib/configuration/constraints/rsc_location[@id=&apos;loc-promotable-clone&apos;]"/>
+  <change operation="delete" path="/cib/configuration/crm_config/cluster_property_set[@id='cib-bootstrap-options']"/>
+  <change operation="delete" path="/cib/configuration/nodes/node[@id='1']"/>
+  <change operation="delete" path="/cib/configuration/nodes/node[@id='2']"/>
+  <change operation="delete" path="/cib/configuration/resources/clone[@id='ping-clone']"/>
+  <change operation="delete" path="/cib/configuration/resources/primitive[@id='Fencing']"/>
+  <change operation="delete" path="/cib/configuration/resources/primitive[@id='dummy']"/>
+  <change operation="delete" path="/cib/configuration/resources/clone[@id='inactive-clone']"/>
+  <change operation="delete" path="/cib/configuration/resources/group[@id='inactive-group']"/>
+  <change operation="delete" path="/cib/configuration/resources/bundle[@id='httpd-bundle']"/>
+  <change operation="delete" path="/cib/configuration/resources/group[@id='exim-group']"/>
+  <change operation="delete" path="/cib/configuration/resources/clone[@id='mysql-clone-group']"/>
+  <change operation="delete" path="/cib/configuration/resources/clone[@id='promotable-clone']"/>
+  <change operation="delete" path="/cib/configuration/constraints/rsc_location[@id='not-on-cluster1']"/>
+  <change operation="delete" path="/cib/configuration/constraints/rsc_location[@id='loc-promotable-clone']"/>
   <change operation="delete" path="/cib/configuration/tags"/>
   <change operation="delete" path="/cib/configuration/op_defaults"/>
-  <change operation="delete" path="/cib/status/node_state[@id=&apos;2&apos;]"/>
-  <change operation="delete" path="/cib/status/node_state[@id=&apos;1&apos;]"/>
-  <change operation="delete" path="/cib/status/node_state[@id=&apos;httpd-bundle-0&apos;]"/>
-  <change operation="delete" path="/cib/status/node_state[@id=&apos;httpd-bundle-1&apos;]"/>
+  <change operation="delete" path="/cib/status/node_state[@id='2']"/>
+  <change operation="delete" path="/cib/status/node_state[@id='1']"/>
+  <change operation="delete" path="/cib/status/node_state[@id='httpd-bundle-0']"/>
+  <change operation="delete" path="/cib/status/node_state[@id='httpd-bundle-1']"/>
   <change operation="modify" path="/cib">
     <change-list>
-      <change-attr name="crm_feature_set" operation="set" value="3.19.0"/>
+      <change-attr name="crm_feature_set" operation="set" value=""/>
+      <change-attr name="validate-with" operation="set" value="pacemaker-X"/>
       <change-attr name="num_updates" operation="set" value="0"/>
       <change-attr name="admin_epoch" operation="set" value="0"/>
       <change-attr name="cib-last-written" operation="unset"/>
@@ -7898,49 +10255,63 @@ crm_shadow: Could not access shadow instance 'cts-cli': No such file or director
 </pacemaker-result>
 =#=#=#= End test: Switch to nonexistent shadow instance (force) (XML) - No such object (105) =#=#=#=
 * Passed: crm_shadow     - Switch to nonexistent shadow instance (force) (XML)
-=#=#=#= Begin test: Verify a file-specified invalid configuration, outputting as xml =#=#=#=
+=#=#=#= Begin test: Verify a file-specified invalid configuration (text output) =#=#=#=
+Errors found during check: config not valid
+-V may provide more details
+=#=#=#= End test: Verify a file-specified invalid configuration (text output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify a file-specified invalid configuration (text output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (verbose text output) =#=#=#=
+unpack_config 	warning: Blind faith: not fencing unseen nodes
+Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource
+Ignoring <clone> resource 'test2-clone' because configuration is invalid
+CIB did not pass schema validation
+Errors found during check: config not valid
+=#=#=#= End test: Verify a file-specified invalid configuration (verbose text output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify a file-specified invalid configuration (verbose text output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (quiet text output) =#=#=#=
+=#=#=#= End test: Verify a file-specified invalid configuration (quiet text output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify a file-specified invalid configuration (quiet text output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (XML output) =#=#=#=
 <pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml">
   <status code="78" message="Invalid configuration">
     <errors>
       <error>Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
       <error>Ignoring &lt;clone&gt; resource 'test2-clone' because configuration is invalid</error>
-      <error>crm_verify: Errors found during check: config not valid</error>
+      <error>CIB did not pass schema validation</error>
+      <error>Errors found during check: config not valid</error>
     </errors>
   </status>
 </pacemaker-result>
-=#=#=#= End test: Verify a file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify     - Verify a file-specified invalid configuration, outputting as xml
-=#=#=#= Begin test: Verify another file-specified invalid configuration, outputting as xml =#=#=#=
-<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml">
+=#=#=#= End test: Verify a file-specified invalid configuration (XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify a file-specified invalid configuration (XML output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (verbose XML output) =#=#=#=
+unpack_config 	warning: Blind faith: not fencing unseen nodes
+<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --verbose">
   <status code="78" message="Invalid configuration">
     <errors>
-      <error>Resource start-up disabled since no STONITH resources have been defined</error>
-      <error>Either configure some or disable STONITH with the stonith-enabled option</error>
-      <error>NOTE: Clusters with shared data need STONITH to ensure data integrity</error>
-      <error>Node pcmk-1 is unclean but cannot be fenced</error>
-      <error>Node pcmk-2 is unclean but cannot be fenced</error>
-      <error>crm_verify: Errors found during check: config not valid</error>
+      <error>Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
+      <error>Ignoring &lt;clone&gt; resource 'test2-clone' because configuration is invalid</error>
+      <error>CIB did not pass schema validation</error>
+      <error>Errors found during check: config not valid</error>
     </errors>
   </status>
 </pacemaker-result>
-=#=#=#= End test: Verify another file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify     - Verify another file-specified invalid configuration, outputting as xml
-=#=#=#= Begin test: Verbosely verify a file-specified invalid configuration, outputting as xml =#=#=#=
-unpack_config 	warning: Blind faith: not fencing unseen nodes
-<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --verbose">
+=#=#=#= End test: Verify a file-specified invalid configuration (verbose XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify a file-specified invalid configuration (verbose XML output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (quiet XML output) =#=#=#=
+<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --quiet">
   <status code="78" message="Invalid configuration">
     <errors>
       <error>Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
       <error>Ignoring &lt;clone&gt; resource 'test2-clone' because configuration is invalid</error>
-      <error>crm_verify: Errors found during check: config not valid</error>
+      <error>CIB did not pass schema validation</error>
     </errors>
   </status>
 </pacemaker-result>
-=#=#=#= End test: Verbosely verify a file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify     - Verbosely verify a file-specified invalid configuration, outputting as xml
-=#=#=#= Begin test: Verbosely verify another file-specified invalid configuration, outputting as xml =#=#=#=
-(cluster_status@status.c:113) 	warning: Fencing and resource management disabled due to lack of quorum
-<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml --verbose">
+=#=#=#= End test: Verify a file-specified invalid configuration (quiet XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify a file-specified invalid configuration (quiet XML output)
+=#=#=#= Begin test: Verify another file-specified invalid configuration (XML output) =#=#=#=
+<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml">
   <status code="78" message="Invalid configuration">
     <errors>
       <error>Resource start-up disabled since no STONITH resources have been defined</error>
@@ -7948,12 +10319,13 @@ unpack_config 	warning: Blind faith: not fencing unseen nodes
       <error>NOTE: Clusters with shared data need STONITH to ensure data integrity</error>
       <error>Node pcmk-1 is unclean but cannot be fenced</error>
       <error>Node pcmk-2 is unclean but cannot be fenced</error>
-      <error>crm_verify: Errors found during check: config not valid</error>
+      <error>CIB did not pass schema validation</error>
+      <error>Errors found during check: config not valid</error>
     </errors>
   </status>
 </pacemaker-result>
-=#=#=#= End test: Verbosely verify another file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify     - Verbosely verify another file-specified invalid configuration, outputting as xml
+=#=#=#= End test: Verify another file-specified invalid configuration (XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify     - Verify another file-specified invalid configuration (XML output)
 =#=#=#= Begin test: Verify a file-specified valid configuration, outputting as xml =#=#=#=
 <pacemaker-result api-version="X" request="crm_mon.xml --output-as=xml">
   <status code="0" message="OK"/>