File pacemaker-libpe_status-use-consistent-monitor-for-implicit-remotes.patch of Package pacemaker

commit 3e510856160ff12b80b48fdca213335d7552feeb
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Tue Jan 2 16:12:59 2018 -0600

    Low: libpe_status: use consistent monitor for implicit remotes
    
    Also update affected regression tests.

Index: pacemaker-1.1.18+20171218.8a704193c/include/crm/pengine/remote.h
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/include/crm/pengine/remote.h
+++ pacemaker-1.1.18+20171218.8a704193c/include/crm/pengine/remote.h
@@ -28,9 +28,7 @@ void pe_foreach_guest_node(const pe_work
                            void (*helper)(const node_t*, void*), void *user_data);
 xmlNode *pe_create_remote_xml(xmlNode *parent, const char *uname,
                               const char *container_id, const char *migrateable,
-                              const char *is_managed, const char *interval,
-                              const char *monitor_timeout,
-                              const char *start_timeout,
+                              const char *is_managed, const char *start_timeout,
                               const char *server, const char *port);
 
 #endif
Index: pacemaker-1.1.18+20171218.8a704193c/lib/pengine/container.c
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/lib/pengine/container.c
+++ pacemaker-1.1.18+20171218.8a704193c/lib/pengine/container.c
@@ -557,9 +557,8 @@ create_remote_resource(
          * remote should be ordered relative to docker.
          */
         xml_remote = pe_create_remote_xml(NULL, id, tuple->docker->id,
-                                          NULL, NULL, "60s", NULL,
-                                          NULL, connect_name,
-                                          (data->control_port?
+                                          NULL, NULL, NULL,
+                                          connect_name, (data->control_port?
                                            data->control_port : port_s));
         free(port_s);
 
Index: pacemaker-1.1.18+20171218.8a704193c/lib/pengine/remote.c
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/lib/pengine/remote.c
+++ pacemaker-1.1.18+20171218.8a704193c/lib/pengine/remote.c
@@ -142,23 +142,14 @@ pe_foreach_guest_node(const pe_working_s
  * \param[in] container        If not NULL, use this as connection container
  * \param[in] migrateable      If not NULL, use as allow-migrate value
  * \param[in] is_managed       If not NULL, use as is-managed value
- * \param[in] interval         If not NULL, create recurring monitor with this interval
- * \param[in] monitor_timeout  If not NULL, use as remote connect timeout
  * \param[in] start_timeout    If not NULL, use as remote connect timeout
  * \param[in] server           If not NULL, use as remote server value
  * \param[in] port             If not NULL, use as remote port value
- *
- * \note We should standardize on a single interval and monitor_timeout, but
- *       that would cause LRM history entries in active mixed-version clusters
- *       (and regression tests) to require a new monitor operation due to
- *       changed parameters. It might be worthwhile to do at a significant
- *       version bump.
  */
 xmlNode *
 pe_create_remote_xml(xmlNode *parent, const char *uname,
                      const char *container_id, const char *migrateable,
-                     const char *is_managed, const char *interval,
-                     const char *monitor_timeout, const char *start_timeout,
+                     const char *is_managed, const char *start_timeout,
                      const char *server, const char *port)
 {
     xmlNode *remote;
@@ -202,15 +193,10 @@ pe_create_remote_xml(xmlNode *parent, co
     }
 
     // Add operations
-    if (interval || start_timeout) {
-        xml_sub = create_xml_node(remote, "operations");
-        if (interval) {
-            crm_create_op_xml(xml_sub, uname, "monitor", interval,
-                              monitor_timeout);
-        }
-        if (start_timeout) {
-            crm_create_op_xml(xml_sub, uname, "start", "0", start_timeout);
-        }
+    xml_sub = create_xml_node(remote, "operations");
+    crm_create_op_xml(xml_sub, uname, "monitor", "30s", "30s");
+    if (start_timeout) {
+        crm_create_op_xml(xml_sub, uname, "start", "0", start_timeout);
     }
     return remote;
 }
Index: pacemaker-1.1.18+20171218.8a704193c/lib/pengine/unpack.c
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/lib/pengine/unpack.c
+++ pacemaker-1.1.18+20171218.8a704193c/lib/pengine/unpack.c
@@ -491,7 +491,7 @@ expand_remote_rsc_meta(xmlNode *xml_obj,
     }
 
     pe_create_remote_xml(parent, remote_name, container_id,
-                         remote_allow_migrate, container_managed, "30s", "30s",
+                         remote_allow_migrate, container_managed,
                          connect_timeout, remote_server, remote_port);
     return remote_name;
 }
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-nested-colocation.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-nested-colocation.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-nested-colocation.dot
@@ -12,8 +12,8 @@ digraph "g" {
 "rabbitmq-bundle-0_monitor_0 overcloud-galera-1" [ style=bold color="green" fontcolor="black"]
 "rabbitmq-bundle-0_monitor_0 overcloud-galera-2" -> "rabbitmq-bundle-0_start_0 overcloud-controller-0" [ style = bold]
 "rabbitmq-bundle-0_monitor_0 overcloud-galera-2" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-0_monitor_60000 overcloud-controller-0" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-0_start_0 overcloud-controller-0" -> "rabbitmq-bundle-0_monitor_60000 overcloud-controller-0" [ style = bold]
+"rabbitmq-bundle-0_monitor_30000 overcloud-controller-0" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-0_start_0 overcloud-controller-0" -> "rabbitmq-bundle-0_monitor_30000 overcloud-controller-0" [ style = bold]
 "rabbitmq-bundle-0_start_0 overcloud-controller-0" -> "rabbitmq:0_monitor_0 rabbitmq-bundle-0" [ style = bold]
 "rabbitmq-bundle-0_start_0 overcloud-controller-0" -> "rabbitmq:0_monitor_10000 rabbitmq-bundle-0" [ style = bold]
 "rabbitmq-bundle-0_start_0 overcloud-controller-0" -> "rabbitmq:0_start_0 rabbitmq-bundle-0" [ style = bold]
@@ -30,8 +30,8 @@ digraph "g" {
 "rabbitmq-bundle-1_monitor_0 overcloud-galera-1" [ style=bold color="green" fontcolor="black"]
 "rabbitmq-bundle-1_monitor_0 overcloud-galera-2" -> "rabbitmq-bundle-1_start_0 overcloud-controller-1" [ style = bold]
 "rabbitmq-bundle-1_monitor_0 overcloud-galera-2" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-1_monitor_60000 overcloud-controller-1" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-1_start_0 overcloud-controller-1" -> "rabbitmq-bundle-1_monitor_60000 overcloud-controller-1" [ style = bold]
+"rabbitmq-bundle-1_monitor_30000 overcloud-controller-1" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-1_start_0 overcloud-controller-1" -> "rabbitmq-bundle-1_monitor_30000 overcloud-controller-1" [ style = bold]
 "rabbitmq-bundle-1_start_0 overcloud-controller-1" -> "rabbitmq:1_monitor_0 rabbitmq-bundle-1" [ style = bold]
 "rabbitmq-bundle-1_start_0 overcloud-controller-1" -> "rabbitmq:1_monitor_10000 rabbitmq-bundle-1" [ style = bold]
 "rabbitmq-bundle-1_start_0 overcloud-controller-1" -> "rabbitmq:1_start_0 rabbitmq-bundle-1" [ style = bold]
@@ -48,8 +48,8 @@ digraph "g" {
 "rabbitmq-bundle-2_monitor_0 overcloud-galera-1" [ style=bold color="green" fontcolor="black"]
 "rabbitmq-bundle-2_monitor_0 overcloud-galera-2" -> "rabbitmq-bundle-2_start_0 overcloud-controller-2" [ style = bold]
 "rabbitmq-bundle-2_monitor_0 overcloud-galera-2" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-2_monitor_60000 overcloud-controller-2" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-2_start_0 overcloud-controller-2" -> "rabbitmq-bundle-2_monitor_60000 overcloud-controller-2" [ style = bold]
+"rabbitmq-bundle-2_monitor_30000 overcloud-controller-2" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-2_start_0 overcloud-controller-2" -> "rabbitmq-bundle-2_monitor_30000 overcloud-controller-2" [ style = bold]
 "rabbitmq-bundle-2_start_0 overcloud-controller-2" -> "rabbitmq:2_monitor_0 rabbitmq-bundle-2" [ style = bold]
 "rabbitmq-bundle-2_start_0 overcloud-controller-2" -> "rabbitmq:2_monitor_10000 rabbitmq-bundle-2" [ style = bold]
 "rabbitmq-bundle-2_start_0 overcloud-controller-2" -> "rabbitmq:2_start_0 rabbitmq-bundle-2" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-nested-colocation.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-nested-colocation.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-nested-colocation.exp
@@ -342,9 +342,9 @@
   </synapse>
   <synapse id="21">
     <action_set>
-      <rsc_op id="43" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_60000" on_node="overcloud-controller-0" on_node_uuid="1">
+      <rsc_op id="43" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_30000" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -388,7 +388,7 @@
     <action_set>
       <rsc_op id="29" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-galera-2" on_node_uuid="6">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-galera-2" CRM_meta_on_node_uuid="6" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-galera-2" CRM_meta_on_node_uuid="6" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -401,7 +401,7 @@
     <action_set>
       <rsc_op id="26" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-galera-1" on_node_uuid="5">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-galera-1" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-galera-1" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -414,7 +414,7 @@
     <action_set>
       <rsc_op id="23" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-galera-0" on_node_uuid="4">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-galera-0" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-galera-0" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -427,7 +427,7 @@
     <action_set>
       <rsc_op id="20" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -440,7 +440,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -453,7 +453,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -506,9 +506,9 @@
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="46" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_60000" on_node="overcloud-controller-1" on_node_uuid="2">
+      <rsc_op id="46" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_30000" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -552,7 +552,7 @@
     <action_set>
       <rsc_op id="30" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-galera-2" on_node_uuid="6">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-galera-2" CRM_meta_on_node_uuid="6" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-galera-2" CRM_meta_on_node_uuid="6" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -565,7 +565,7 @@
     <action_set>
       <rsc_op id="27" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-galera-1" on_node_uuid="5">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-galera-1" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-galera-1" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -578,7 +578,7 @@
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-galera-0" on_node_uuid="4">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-galera-0" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-galera-0" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -591,7 +591,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -604,7 +604,7 @@
     <action_set>
       <rsc_op id="18" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -617,7 +617,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -670,9 +670,9 @@
   </synapse>
   <synapse id="43">
     <action_set>
-      <rsc_op id="49" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_60000" on_node="overcloud-controller-2" on_node_uuid="3">
+      <rsc_op id="49" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_30000" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -716,7 +716,7 @@
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-galera-2" on_node_uuid="6">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-galera-2" CRM_meta_on_node_uuid="6" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-galera-2" CRM_meta_on_node_uuid="6" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -729,7 +729,7 @@
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-galera-1" on_node_uuid="5">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-galera-1" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-galera-1" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -742,7 +742,7 @@
     <action_set>
       <rsc_op id="25" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-galera-0" on_node_uuid="4">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-galera-0" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-galera-0" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -755,7 +755,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -768,7 +768,7 @@
     <action_set>
       <rsc_op id="19" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -781,7 +781,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-rabbit-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-rabbit-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-nested-colocation.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-nested-colocation.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-nested-colocation.summary
@@ -68,9 +68,9 @@ Executing cluster transition:
  * Resource action: rabbitmq:1      monitor on rabbitmq-bundle-1
  * Resource action: rabbitmq:2      monitor on rabbitmq-bundle-2
  * Pseudo action:   rabbitmq-bundle-clone_start_0
- * Resource action: rabbitmq-bundle-0 monitor=60000 on overcloud-controller-0
- * Resource action: rabbitmq-bundle-1 monitor=60000 on overcloud-controller-1
- * Resource action: rabbitmq-bundle-2 monitor=60000 on overcloud-controller-2
+ * Resource action: rabbitmq-bundle-0 monitor=30000 on overcloud-controller-0
+ * Resource action: rabbitmq-bundle-1 monitor=30000 on overcloud-controller-1
+ * Resource action: rabbitmq-bundle-2 monitor=30000 on overcloud-controller-2
  * Resource action: rabbitmq:0      start on rabbitmq-bundle-0
  * Resource action: rabbitmq:1      start on rabbitmq-bundle-1
  * Resource action: rabbitmq:2      start on rabbitmq-bundle-2
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-fencing.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-fencing.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-fencing.dot
@@ -8,8 +8,8 @@ digraph "g" {
 "galera-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-0_monitor_0 controller-2" -> "galera-bundle-0_start_0 controller-2" [ style = dashed]
 "galera-bundle-0_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_monitor_60000 controller-2" [ style=dashed color="red" fontcolor="black"]
-"galera-bundle-0_start_0 controller-2" -> "galera-bundle-0_monitor_60000 controller-2" [ style = dashed]
+"galera-bundle-0_monitor_30000 controller-2" [ style=dashed color="red" fontcolor="black"]
+"galera-bundle-0_start_0 controller-2" -> "galera-bundle-0_monitor_30000 controller-2" [ style = dashed]
 "galera-bundle-0_start_0 controller-2" -> "galera_monitor_20000 galera-bundle-0" [ style = dashed]
 "galera-bundle-0_start_0 controller-2" -> "galera_monitor_30000 galera-bundle-0" [ style = dashed]
 "galera-bundle-0_start_0 controller-2" -> "galera_start_0 galera-bundle-0" [ style = dashed]
@@ -102,8 +102,8 @@ digraph "g" {
 "rabbitmq-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
 "rabbitmq-bundle-0_monitor_0 controller-2" -> "rabbitmq-bundle-0_start_0 controller-1" [ style = dashed]
 "rabbitmq-bundle-0_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-0_monitor_60000 controller-1" [ style=dashed color="red" fontcolor="black"]
-"rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq-bundle-0_monitor_60000 controller-1" [ style = dashed]
+"rabbitmq-bundle-0_monitor_30000 controller-1" [ style=dashed color="red" fontcolor="black"]
+"rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq-bundle-0_monitor_30000 controller-1" [ style = dashed]
 "rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed]
 "rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed]
 "rabbitmq-bundle-0_start_0 controller-1" [ style=dashed color="red" fontcolor="black"]
@@ -203,8 +203,8 @@ digraph "g" {
 "redis-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-0_monitor_0 controller-2" -> "redis-bundle-0_start_0 controller-1" [ style = dashed]
 "redis-bundle-0_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_monitor_60000 controller-1" [ style=dashed color="red" fontcolor="black"]
-"redis-bundle-0_start_0 controller-1" -> "redis-bundle-0_monitor_60000 controller-1" [ style = dashed]
+"redis-bundle-0_monitor_30000 controller-1" [ style=dashed color="red" fontcolor="black"]
+"redis-bundle-0_start_0 controller-1" -> "redis-bundle-0_monitor_30000 controller-1" [ style = dashed]
 "redis-bundle-0_start_0 controller-1" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed]
 "redis-bundle-0_start_0 controller-1" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed]
 "redis-bundle-0_start_0 controller-1" -> "redis_start_0 redis-bundle-0" [ style = dashed]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-fencing.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-fencing.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-fencing.exp
@@ -385,7 +385,7 @@
     <action_set>
       <rsc_op id="36" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-0"  port="3122"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-0"  port="3122"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -394,7 +394,7 @@
     <action_set>
       <rsc_op id="30" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-0"  port="3122"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-0"  port="3122"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -403,7 +403,7 @@
     <action_set>
       <rsc_op id="37" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-1"  port="3122"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-1"  port="3122"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -412,7 +412,7 @@
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-2"  port="3122"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-2"  port="3122"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -567,7 +567,7 @@
     <action_set>
       <rsc_op id="38" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-0"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -576,7 +576,7 @@
     <action_set>
       <rsc_op id="32" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-0"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -585,7 +585,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -594,7 +594,7 @@
     <action_set>
       <rsc_op id="33" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1411,7 +1411,7 @@
     <action_set>
       <rsc_op id="40" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-0"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-0"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1420,7 +1420,7 @@
     <action_set>
       <rsc_op id="34" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-0"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-0"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1429,7 +1429,7 @@
     <action_set>
       <rsc_op id="41" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1438,7 +1438,7 @@
     <action_set>
       <rsc_op id="35" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-fencing.xml
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-fencing.xml
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-fencing.xml
@@ -393,7 +393,7 @@
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-2" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-2">
             <lrm_rsc_op id="rabbitmq-bundle-2_last_0" operation_key="rabbitmq-bundle-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="48:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;48:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1505142219" last-rc-change="1505142219" exec-time="0" queue-time="0" op-digest="205c791aea96714f7aa1cb111c727e1b" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-2_monitor_60000" operation_key="rabbitmq-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="52:1899:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;52:1899:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142229" exec-time="0" queue-time="0" op-digest="19642b17998fd21ff264d776e5dcffb7"/>
+            <lrm_rsc_op id="rabbitmq-bundle-2_monitor_30000" operation_key="rabbitmq-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="52:1899:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;52:1899:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1505142229" exec-time="0" queue-time="0" op-digest="f765304166a359903e5aea671a7275d0"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume" type="openstack-cinder-volume" class="systemd">
             <lrm_rsc_op id="openstack-cinder-volume_last_0" operation_key="openstack-cinder-volume_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="200:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;200:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="91" rc-code="0" op-status="0" interval="0" last-run="1505142206" last-rc-change="1505142206" exec-time="2252" queue-time="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
@@ -445,7 +445,7 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-2" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-2">
             <lrm_rsc_op id="redis-bundle-2_last_0" operation_key="redis-bundle-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="137:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;137:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1505142218" last-rc-change="1505142218" exec-time="0" queue-time="0" op-digest="f325849fbffe2e62970eb201a50da9f3" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-2_monitor_60000" operation_key="redis-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="124:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;124:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="5" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142219" exec-time="0" queue-time="0" op-digest="1c97595acf862a2449ada08e9770bdf5"/>
+            <lrm_rsc_op id="redis-bundle-2_monitor_30000" operation_key="redis-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="124:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;124:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="5" rc-code="0" op-status="0" interval="30000" last-rc-change="1505142219" exec-time="0" queue-time="0" op-digest="1edf361604603a3dc6ccd940ce449f27"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="45:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:7;45:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="65" rc-code="7" op-status="0" interval="0" last-run="1505142205" last-rc-change="1505142205" exec-time="7640" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
@@ -469,7 +469,7 @@
           </lrm_resource>
           <lrm_resource id="galera-bundle-2" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-2">
             <lrm_rsc_op id="galera-bundle-2_last_0" operation_key="galera-bundle-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="96:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;96:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="2" rc-code="0" op-status="0" interval="0" last-run="1505142218" last-rc-change="1505142218" exec-time="0" queue-time="0" op-digest="f282b02648444d9d95065cede4784d97" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-2_monitor_60000" operation_key="galera-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="84:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;84:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142219" exec-time="0" queue-time="0" op-digest="67d79251e7c202b367dded079a1a25eb"/>
+            <lrm_rsc_op id="galera-bundle-2_monitor_30000" operation_key="galera-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="84:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;84:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1505142219" exec-time="0" queue-time="0" op-digest="360b985b565e1db13335e072b0bb4305"/>
           </lrm_resource>
           <lrm_resource id="stonith-fence_ipmilan-525400efba5c" type="fence_ipmilan" class="stonith">
             <lrm_rsc_op id="stonith-fence_ipmilan-525400efba5c_last_0" operation_key="stonith-fence_ipmilan-525400efba5c_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="174:19:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;174:19:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-2" call-id="109" rc-code="0" op-status="0" interval="0" last-run="1505211628" last-rc-change="1505211628" exec-time="91" queue-time="0" op-digest="7e2644d21ce439341c432a3349cc59f9" op-secure-params=" passwd  password " op-secure-digest="e904c2fd62f29caf0b307c1b84254bc0"/>
@@ -561,15 +561,15 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-1" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-1">
             <lrm_rsc_op id="redis-bundle-1_last_0" operation_key="redis-bundle-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="134:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;134:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="2" rc-code="0" op-status="0" interval="0" last-run="1505211888" last-rc-change="1505211888" exec-time="0" queue-time="0" op-digest="cd98602d6f977947327050913302f861" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-1_monitor_60000" operation_key="redis-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="120:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;120:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211890" exec-time="0" queue-time="0" op-digest="0491b76e934baa33a7f246cd2c3f54a7"/>
+            <lrm_rsc_op id="redis-bundle-1_monitor_30000" operation_key="redis-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="120:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;120:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1505211890" exec-time="0" queue-time="0" op-digest="a076da96e60da0ec2faccf5f38186767"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-1" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-1">
             <lrm_rsc_op id="galera-bundle-1_last_0" operation_key="galera-bundle-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="95:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;95:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1505211888" last-rc-change="1505211888" exec-time="0" queue-time="0" op-digest="ed95b71467015049c875f75798f405fb" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-1_monitor_60000" operation_key="galera-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="80:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;80:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="5" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211890" exec-time="0" queue-time="0" op-digest="cd5e49e967c83be8abedad4b1f3136b7"/>
+            <lrm_rsc_op id="galera-bundle-1_monitor_30000" operation_key="galera-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="80:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;80:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="5" rc-code="0" op-status="0" interval="30000" last-rc-change="1505211890" exec-time="0" queue-time="0" op-digest="1cb41a6c33cc25b47ebeff7bb61c3eeb"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-1" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-1">
             <lrm_rsc_op id="rabbitmq-bundle-1_last_0" operation_key="rabbitmq-bundle-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="61:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;61:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1505211887" last-rc-change="1505211887" exec-time="0" queue-time="0" op-digest="f1d68ab267df6867301fcff08041cd2f" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-1_monitor_60000" operation_key="rabbitmq-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="45:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;45:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211890" exec-time="0" queue-time="0" op-digest="76f9ab23bc58402930f7f92ff2ab9d75"/>
+            <lrm_rsc_op id="rabbitmq-bundle-1_monitor_30000" operation_key="rabbitmq-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="45:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;45:21:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1505211890" exec-time="0" queue-time="0" op-digest="61c3a926b0d3bd428b481dd6e40b1745"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -654,15 +654,15 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-0" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-0">
             <lrm_rsc_op id="redis-bundle-0_last_0" operation_key="redis-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="116:15:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;116:15:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="8" rc-code="0" op-status="0" interval="0" last-run="1505211500" last-rc-change="1505211500" exec-time="0" queue-time="0" op-digest="dd323696d6c8ed14cb71914c411664c9" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-0_monitor_60000" operation_key="redis-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="119:16:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;119:16:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="9" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211502" exec-time="0" queue-time="0" op-digest="e3ae7972e4989b9b928f3ff082c5ac23"/>
+            <lrm_rsc_op id="redis-bundle-0_monitor_30000" operation_key="redis-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="119:16:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;119:16:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="9" rc-code="0" op-status="0" interval="30000" last-rc-change="1505211502" exec-time="0" queue-time="0" op-digest="e3ae7972e4989b9b928f3ff082c5ac23"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-0" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-0">
             <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="86:7:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;86:7:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1505210299" last-rc-change="1505210299" exec-time="0" queue-time="0" op-digest="37e9ab931fa7b5d2122c4cd44c56b7d2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-0_monitor_60000" operation_key="galera-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="75:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;75:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="5" rc-code="0" op-status="0" interval="60000" last-rc-change="1505210300" exec-time="0" queue-time="0" op-digest="1ef5cbd05a3687236c669af720a810bc"/>
+            <lrm_rsc_op id="galera-bundle-0_monitor_30000" operation_key="galera-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="75:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;75:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="5" rc-code="0" op-status="0" interval="30000" last-rc-change="1505210300" exec-time="0" queue-time="0" op-digest="1ef5cbd05a3687236c669af720a810bc"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-0" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-0">
             <lrm_rsc_op id="rabbitmq-bundle-0_last_0" operation_key="rabbitmq-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="52:7:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;52:7:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1505210297" last-rc-change="1505210297" exec-time="0" queue-time="0" op-digest="8dc3f9844e70d4458a7edcd7091ecf50" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_60000" operation_key="rabbitmq-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;40:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1505210300" exec-time="0" queue-time="0" op-digest="cca9d25863986607e6440270f0640ff5"/>
+            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_30000" operation_key="rabbitmq-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;40:8:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-0" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1505210300" exec-time="0" queue-time="0" op-digest="cca9d25863986607e6440270f0640ff5"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start-2.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.dot
@@ -1,7 +1,7 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
-"galera-bundle-0_monitor_60000 undercloud" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_60000 undercloud" [ style = bold]
+"galera-bundle-0_monitor_30000 undercloud" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_30000 undercloud" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_0 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_20000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_30000 galera-bundle-0" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start-2.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.exp
@@ -302,9 +302,9 @@
   </synapse>
   <synapse id="21">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
+      <rsc_op id="4" operation="monitor" operation_key="galera-bundle-0_monitor_30000" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="undercloud"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="undercloud"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start-2.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.summary
@@ -67,7 +67,7 @@ Executing cluster transition:
  * Resource action: galera-bundle-docker-0 start on undercloud
  * Resource action: galera-bundle-docker-0 monitor=60000 on undercloud
  * Resource action: galera-bundle-0 start on undercloud
- * Resource action: galera-bundle-0 monitor=60000 on undercloud
+ * Resource action: galera-bundle-0 monitor=30000 on undercloud
  * Resource action: galera:0        monitor on galera-bundle-0
  * Pseudo action:   galera-bundle-master_start_0
  * Resource action: galera:0        start on galera-bundle-0
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.xml
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start-2.xml
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start-2.xml
@@ -312,7 +312,7 @@
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-0" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-0">
             <lrm_rsc_op id="rabbitmq-bundle-0_last_0" operation_key="rabbitmq-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="4:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;4:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1496303576" last-rc-change="1496303576" exec-time="0" queue-time="0" op-digest="ee16760fa8c27e6585c1e35c244d7652" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_60000" operation_key="rabbitmq-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303578" exec-time="0" queue-time="0" op-digest="92f557a57dfbb50be88282a4674ea681"/>
+            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_30000" operation_key="rabbitmq-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1496303578" exec-time="0" queue-time="0" op-digest="ad3679ab0e6f6099d04110a3616c74c2"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="16:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;16:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="17" rc-code="0" op-status="0" interval="0" last-run="1496303595" last-rc-change="1496303595" exec-time="920" queue-time="0" op-digest="a25a3351a7fd1a430a6a8991da64de98"/>
@@ -320,7 +320,7 @@
           </lrm_resource>
           <lrm_resource id="galera-bundle-0" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-0">
             <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="18:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;18:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1496303596" last-rc-change="1496303596" exec-time="0" queue-time="0" op-digest="edf22e374195d93e82f3c9cc174d519f" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-0_monitor_60000" operation_key="galera-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="20:9:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;20:9:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303600" exec-time="0" queue-time="0" op-digest="40c47455f6993c120f9a064ae51260db"/>
+            <lrm_rsc_op id="galera-bundle-0_monitor_30000" operation_key="galera-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="20:9:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;20:9:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1496303600" exec-time="0" queue-time="0" op-digest="40c47455f6993c120f9a064ae51260db"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="34:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;34:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="28" rc-code="0" op-status="0" interval="0" last-run="1496303664" last-rc-change="1496303664" exec-time="824" queue-time="0" op-digest="b26392b2cfc73ee1c83c6bb1ec2aa4c7"/>
@@ -328,7 +328,7 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-0" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-0">
             <lrm_rsc_op id="redis-bundle-0_last_0" operation_key="redis-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="36:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;36:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1496303664" last-rc-change="1496303664" exec-time="0" queue-time="0" op-digest="9a6281aab223af75359e5b5a07161162" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-0_monitor_60000" operation_key="redis-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303667" exec-time="0" queue-time="0" op-digest="04ffb214f519838e579c97e8aa002054"/>
+            <lrm_rsc_op id="redis-bundle-0_monitor_30000" operation_key="redis-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1496303667" exec-time="0" queue-time="0" op-digest="d0fc99d0b5bbb65f1da74f86b2eec758"/>
           </lrm_resource>
           <lrm_resource id="ip-192.168.122.254" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-192.168.122.254_last_0" operation_key="ip-192.168.122.254_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="53:21:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;53:21:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="35" rc-code="0" op-status="0" interval="0" last-run="1496303683" last-rc-change="1496303683" exec-time="63" queue-time="0" op-digest="d6875d68a09b5550030b8b6b7cdc9294"/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.dot
@@ -1,8 +1,8 @@
 digraph "g" {
 "galera-bundle-0_monitor_0 undercloud" -> "galera-bundle-0_start_0 undercloud" [ style = bold]
 "galera-bundle-0_monitor_0 undercloud" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_monitor_60000 undercloud" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_60000 undercloud" [ style = bold]
+"galera-bundle-0_monitor_30000 undercloud" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_30000 undercloud" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_20000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_30000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_start_0 galera-bundle-0" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.exp
@@ -254,9 +254,9 @@
   </synapse>
   <synapse id="18">
     <action_set>
-      <rsc_op id="42" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
+      <rsc_op id="42" operation="monitor" operation_key="galera-bundle-0_monitor_30000" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="undercloud"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="undercloud"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -285,7 +285,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="undercloud"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="undercloud"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.summary
@@ -67,7 +67,7 @@ Executing cluster transition:
  * Resource action: galera-bundle-0 start on undercloud
  * Resource action: galera:0        start on galera-bundle-0
  * Pseudo action:   galera-bundle-master_running_0
- * Resource action: galera-bundle-0 monitor=60000 on undercloud
+ * Resource action: galera-bundle-0 monitor=30000 on undercloud
  * Pseudo action:   galera-bundle_running_0
  * Resource action: galera:0        monitor=30000 on galera-bundle-0
  * Resource action: galera:0        monitor=20000 on galera-bundle-0
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.xml
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-partial-start.xml
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-partial-start.xml
@@ -312,7 +312,7 @@
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-0" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-0">
             <lrm_rsc_op id="rabbitmq-bundle-0_last_0" operation_key="rabbitmq-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="4:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;4:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1496303576" last-rc-change="1496303576" exec-time="0" queue-time="0" op-digest="ee16760fa8c27e6585c1e35c244d7652" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_60000" operation_key="rabbitmq-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303578" exec-time="0" queue-time="0" op-digest="92f557a57dfbb50be88282a4674ea681"/>
+            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_30000" operation_key="rabbitmq-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;7:7:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1496303578" exec-time="0" queue-time="0" op-digest="ad3679ab0e6f6099d04110a3616c74c2"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="34:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;34:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="28" rc-code="0" op-status="0" interval="0" last-run="1496303664" last-rc-change="1496303664" exec-time="824" queue-time="0" op-digest="b26392b2cfc73ee1c83c6bb1ec2aa4c7"/>
@@ -320,7 +320,7 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-0" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-0">
             <lrm_rsc_op id="redis-bundle-0_last_0" operation_key="redis-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="36:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;36:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1496303664" last-rc-change="1496303664" exec-time="0" queue-time="0" op-digest="9a6281aab223af75359e5b5a07161162" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-0_monitor_60000" operation_key="redis-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303667" exec-time="0" queue-time="0" op-digest="04ffb214f519838e579c97e8aa002054"/>
+            <lrm_rsc_op id="redis-bundle-0_monitor_30000" operation_key="redis-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;39:16:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1496303667" exec-time="0" queue-time="0" op-digest="d0fc99d0b5bbb65f1da74f86b2eec758"/>
           </lrm_resource>
           <lrm_resource id="ip-192.168.122.254" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-192.168.122.254_last_0" operation_key="ip-192.168.122.254_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="53:21:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;53:21:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="35" rc-code="0" op-status="0" interval="0" last-run="1496303683" last-rc-change="1496303683" exec-time="63" queue-time="0" op-digest="d6875d68a09b5550030b8b6b7cdc9294"/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone-2.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup-clone-2.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone-2.dot
@@ -5,8 +5,8 @@ digraph "g" {
 "galera-bundle-0_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-0_monitor_0 metal-3" -> "galera-bundle-0_start_0 metal-1" [ style = bold]
 "galera-bundle-0_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_monitor_60000 metal-1" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_60000 metal-1" [ style = bold]
+"galera-bundle-0_monitor_30000 metal-1" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_30000 metal-1" [ style = bold]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_20000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_30000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_start_0 galera-bundle-0" [ style = bold]
@@ -17,8 +17,8 @@ digraph "g" {
 "galera-bundle-1_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-1_monitor_0 metal-3" -> "galera-bundle-1_start_0 metal-2" [ style = bold]
 "galera-bundle-1_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-1_monitor_60000 metal-2" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-1_start_0 metal-2" -> "galera-bundle-1_monitor_60000 metal-2" [ style = bold]
+"galera-bundle-1_monitor_30000 metal-2" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-1_start_0 metal-2" -> "galera-bundle-1_monitor_30000 metal-2" [ style = bold]
 "galera-bundle-1_start_0 metal-2" -> "galera:1_monitor_20000 galera-bundle-1" [ style = bold]
 "galera-bundle-1_start_0 metal-2" -> "galera:1_monitor_30000 galera-bundle-1" [ style = bold]
 "galera-bundle-1_start_0 metal-2" -> "galera:1_start_0 galera-bundle-1" [ style = bold]
@@ -29,8 +29,8 @@ digraph "g" {
 "galera-bundle-2_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-2_monitor_0 metal-3" -> "galera-bundle-2_start_0 metal-3" [ style = bold]
 "galera-bundle-2_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-2_monitor_60000 metal-3" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-2_start_0 metal-3" -> "galera-bundle-2_monitor_60000 metal-3" [ style = bold]
+"galera-bundle-2_monitor_30000 metal-3" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-2_start_0 metal-3" -> "galera-bundle-2_monitor_30000 metal-3" [ style = bold]
 "galera-bundle-2_start_0 metal-3" -> "galera:2_monitor_20000 galera-bundle-2" [ style = bold]
 "galera-bundle-2_start_0 metal-3" -> "galera:2_monitor_30000 galera-bundle-2" [ style = bold]
 "galera-bundle-2_start_0 metal-3" -> "galera:2_start_0 galera-bundle-2" [ style = bold]
@@ -176,8 +176,8 @@ digraph "g" {
 "redis-bundle-0_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-0_monitor_0 metal-3" -> "redis-bundle-0_start_0 metal-1" [ style = bold]
 "redis-bundle-0_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_monitor_60000 metal-1" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_start_0 metal-1" -> "redis-bundle-0_monitor_60000 metal-1" [ style = bold]
+"redis-bundle-0_monitor_30000 metal-1" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-0_start_0 metal-1" -> "redis-bundle-0_monitor_30000 metal-1" [ style = bold]
 "redis-bundle-0_start_0 metal-1" -> "redis:0_monitor_20000 redis-bundle-0" [ style = bold]
 "redis-bundle-0_start_0 metal-1" -> "redis:0_promote_0 redis-bundle-0" [ style = bold]
 "redis-bundle-0_start_0 metal-1" -> "redis:0_start_0 redis-bundle-0" [ style = bold]
@@ -188,8 +188,8 @@ digraph "g" {
 "redis-bundle-1_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-1_monitor_0 metal-3" -> "redis-bundle-1_start_0 metal-2" [ style = bold]
 "redis-bundle-1_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-1_monitor_60000 metal-2" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-1_start_0 metal-2" -> "redis-bundle-1_monitor_60000 metal-2" [ style = bold]
+"redis-bundle-1_monitor_30000 metal-2" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-1_start_0 metal-2" -> "redis-bundle-1_monitor_30000 metal-2" [ style = bold]
 "redis-bundle-1_start_0 metal-2" -> "redis:1_monitor_20000 redis-bundle-1" [ style = bold]
 "redis-bundle-1_start_0 metal-2" -> "redis:1_promote_0 redis-bundle-1" [ style = bold]
 "redis-bundle-1_start_0 metal-2" -> "redis:1_start_0 redis-bundle-1" [ style = bold]
@@ -200,8 +200,8 @@ digraph "g" {
 "redis-bundle-2_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-2_monitor_0 metal-3" -> "redis-bundle-2_start_0 metal-3" [ style = bold]
 "redis-bundle-2_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-2_monitor_60000 metal-3" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-2_start_0 metal-3" -> "redis-bundle-2_monitor_60000 metal-3" [ style = bold]
+"redis-bundle-2_monitor_30000 metal-3" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-2_start_0 metal-3" -> "redis-bundle-2_monitor_30000 metal-3" [ style = bold]
 "redis-bundle-2_start_0 metal-3" -> "redis:2_monitor_20000 redis-bundle-2" [ style = bold]
 "redis-bundle-2_start_0 metal-3" -> "redis:2_promote_0 redis-bundle-2" [ style = bold]
 "redis-bundle-2_start_0 metal-3" -> "redis:2_start_0 redis-bundle-2" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone-2.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup-clone-2.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone-2.exp
@@ -545,9 +545,9 @@
   </synapse>
   <synapse id="34">
     <action_set>
-      <rsc_op id="71" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="metal-1" on_node_uuid="1">
+      <rsc_op id="71" operation="monitor" operation_key="galera-bundle-0_monitor_30000" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="metal-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="metal-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -582,7 +582,7 @@
     <action_set>
       <rsc_op id="36" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -595,7 +595,7 @@
     <action_set>
       <rsc_op id="20" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -608,7 +608,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -687,9 +687,9 @@
   </synapse>
   <synapse id="44">
     <action_set>
-      <rsc_op id="75" operation="monitor" operation_key="galera-bundle-1_monitor_60000" on_node="metal-2" on_node_uuid="2">
+      <rsc_op id="75" operation="monitor" operation_key="galera-bundle-1_monitor_30000" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="metal-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="metal-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -724,7 +724,7 @@
     <action_set>
       <rsc_op id="38" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -737,7 +737,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -750,7 +750,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -829,9 +829,9 @@
   </synapse>
   <synapse id="54">
     <action_set>
-      <rsc_op id="79" operation="monitor" operation_key="galera-bundle-2_monitor_60000" on_node="metal-3" on_node_uuid="3">
+      <rsc_op id="79" operation="monitor" operation_key="galera-bundle-2_monitor_30000" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" addr="metal-3"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="metal-3"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -866,7 +866,7 @@
     <action_set>
       <rsc_op id="40" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -879,7 +879,7 @@
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -892,7 +892,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1726,9 +1726,9 @@
   </synapse>
   <synapse id="109">
     <action_set>
-      <rsc_op id="118" operation="monitor" operation_key="redis-bundle-0_monitor_60000" on_node="metal-1" on_node_uuid="1">
+      <rsc_op id="118" operation="monitor" operation_key="redis-bundle-0_monitor_30000" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="metal-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="metal-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1763,7 +1763,7 @@
     <action_set>
       <rsc_op id="45" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1776,7 +1776,7 @@
     <action_set>
       <rsc_op id="29" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1789,7 +1789,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1868,9 +1868,9 @@
   </synapse>
   <synapse id="119">
     <action_set>
-      <rsc_op id="122" operation="monitor" operation_key="redis-bundle-1_monitor_60000" on_node="metal-2" on_node_uuid="2">
+      <rsc_op id="122" operation="monitor" operation_key="redis-bundle-1_monitor_30000" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1905,7 +1905,7 @@
     <action_set>
       <rsc_op id="47" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1918,7 +1918,7 @@
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1931,7 +1931,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -2010,9 +2010,9 @@
   </synapse>
   <synapse id="129">
     <action_set>
-      <rsc_op id="126" operation="monitor" operation_key="redis-bundle-2_monitor_60000" on_node="metal-3" on_node_uuid="3">
+      <rsc_op id="126" operation="monitor" operation_key="redis-bundle-2_monitor_30000" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" addr="metal-3"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="metal-3"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -2047,7 +2047,7 @@
     <action_set>
       <rsc_op id="49" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -2060,7 +2060,7 @@
     <action_set>
       <rsc_op id="33" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -2073,7 +2073,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone-2.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup-clone-2.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone-2.summary
@@ -111,9 +111,9 @@ Executing cluster transition:
  * Resource action: redis:1         start on redis-bundle-1
  * Resource action: redis:2         start on redis-bundle-2
  * Pseudo action:   redis-bundle-master_running_0
- * Resource action: redis-bundle-0  monitor=60000 on metal-1
- * Resource action: redis-bundle-1  monitor=60000 on metal-2
- * Resource action: redis-bundle-2  monitor=60000 on metal-3
+ * Resource action: redis-bundle-0  monitor=30000 on metal-1
+ * Resource action: redis-bundle-1  monitor=30000 on metal-2
+ * Resource action: redis-bundle-2  monitor=30000 on metal-3
  * Pseudo action:   redis-bundle-master_post_notify_running_0
  * Resource action: redis:0         notify on redis-bundle-0
  * Resource action: redis:1         notify on redis-bundle-1
@@ -177,9 +177,9 @@ Executing cluster transition:
  * Resource action: galera:1        start on galera-bundle-1
  * Resource action: galera:2        start on galera-bundle-2
  * Pseudo action:   galera-bundle-master_running_0
- * Resource action: galera-bundle-0 monitor=60000 on metal-1
- * Resource action: galera-bundle-1 monitor=60000 on metal-2
- * Resource action: galera-bundle-2 monitor=60000 on metal-3
+ * Resource action: galera-bundle-0 monitor=30000 on metal-1
+ * Resource action: galera-bundle-1 monitor=30000 on metal-2
+ * Resource action: galera-bundle-2 monitor=30000 on metal-3
  * Pseudo action:   galera-bundle_running_0
  * Resource action: galera:0        monitor=30000 on galera-bundle-0
  * Resource action: galera:0        monitor=20000 on galera-bundle-0
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup-clone.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone.dot
@@ -5,8 +5,8 @@ digraph "g" {
 "galera-bundle-0_monitor_0 metal-2" [ style=dashed color="red" fontcolor="black"]
 "galera-bundle-0_monitor_0 metal-3" -> "galera-bundle-0_start_0 metal-1" [ style = dashed]
 "galera-bundle-0_monitor_0 metal-3" [ style=dashed color="red" fontcolor="black"]
-"galera-bundle-0_monitor_60000 metal-1" [ style=dashed color="red" fontcolor="black"]
-"galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_60000 metal-1" [ style = dashed]
+"galera-bundle-0_monitor_30000 metal-1" [ style=dashed color="red" fontcolor="black"]
+"galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_30000 metal-1" [ style = dashed]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_20000 galera-bundle-0" [ style = dashed]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_30000 galera-bundle-0" [ style = dashed]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_start_0 galera-bundle-0" [ style = dashed]
@@ -64,8 +64,8 @@ digraph "g" {
 "redis-bundle-0_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-0_monitor_0 metal-3" -> "redis-bundle-0_start_0 metal-2" [ style = bold]
 "redis-bundle-0_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_monitor_60000 metal-2" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_start_0 metal-2" -> "redis-bundle-0_monitor_60000 metal-2" [ style = bold]
+"redis-bundle-0_monitor_30000 metal-2" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-0_start_0 metal-2" -> "redis-bundle-0_monitor_30000 metal-2" [ style = bold]
 "redis-bundle-0_start_0 metal-2" -> "redis:0_monitor_45000 redis-bundle-0" [ style = bold]
 "redis-bundle-0_start_0 metal-2" -> "redis:0_monitor_60000 redis-bundle-0" [ style = bold]
 "redis-bundle-0_start_0 metal-2" -> "redis:0_start_0 redis-bundle-0" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup-clone.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone.exp
@@ -338,9 +338,9 @@
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="70" operation="monitor" operation_key="redis-bundle-0_monitor_60000" on_node="metal-2" on_node_uuid="2">
+      <rsc_op id="70" operation="monitor" operation_key="redis-bundle-0_monitor_30000" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -375,7 +375,7 @@
     <action_set>
       <rsc_op id="19" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -388,7 +388,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -401,7 +401,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup-clone.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup-clone.summary
@@ -53,7 +53,7 @@ Executing cluster transition:
  * Resource action: redis-bundle-0  start on metal-2
  * Resource action: redis:0         start on redis-bundle-0
  * Pseudo action:   redis-bundle-master_running_0
- * Resource action: redis-bundle-0  monitor=60000 on metal-2
+ * Resource action: redis-bundle-0  monitor=30000 on metal-2
  * Pseudo action:   redis-bundle-master_post_notify_running_0
  * Resource action: redis:0         notify on redis-bundle-0
  * Pseudo action:   redis-bundle-master_confirmed-post_notify_running_0
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup.dot
@@ -1,8 +1,8 @@
 digraph "g" {
 "galera-bundle-0_monitor_0 undercloud" -> "galera-bundle-0_start_0 undercloud" [ style = bold]
 "galera-bundle-0_monitor_0 undercloud" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_monitor_60000 undercloud" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_60000 undercloud" [ style = bold]
+"galera-bundle-0_monitor_30000 undercloud" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_30000 undercloud" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_20000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_30000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 undercloud" -> "galera:0_start_0 galera-bundle-0" [ style = bold]
@@ -89,8 +89,8 @@ digraph "g" {
 "openstack-cinder-volume_start_0" [ style=bold color="green" fontcolor="orange"]
 "rabbitmq-bundle-0_monitor_0 undercloud" -> "rabbitmq-bundle-0_start_0 undercloud" [ style = bold]
 "rabbitmq-bundle-0_monitor_0 undercloud" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-0_monitor_60000 undercloud" [ style=bold color="green" fontcolor="black"]
-"rabbitmq-bundle-0_start_0 undercloud" -> "rabbitmq-bundle-0_monitor_60000 undercloud" [ style = bold]
+"rabbitmq-bundle-0_monitor_30000 undercloud" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-0_start_0 undercloud" -> "rabbitmq-bundle-0_monitor_30000 undercloud" [ style = bold]
 "rabbitmq-bundle-0_start_0 undercloud" -> "rabbitmq:0_monitor_10000 rabbitmq-bundle-0" [ style = bold]
 "rabbitmq-bundle-0_start_0 undercloud" -> "rabbitmq:0_start_0 rabbitmq-bundle-0" [ style = bold]
 "rabbitmq-bundle-0_start_0 undercloud" [ style=bold color="green" fontcolor="black"]
@@ -132,8 +132,8 @@ digraph "g" {
 "rabbitmq:0_start_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-0_monitor_0 undercloud" -> "redis-bundle-0_start_0 undercloud" [ style = bold]
 "redis-bundle-0_monitor_0 undercloud" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_monitor_60000 undercloud" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-0_start_0 undercloud" -> "redis-bundle-0_monitor_60000 undercloud" [ style = bold]
+"redis-bundle-0_monitor_30000 undercloud" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-0_start_0 undercloud" -> "redis-bundle-0_monitor_30000 undercloud" [ style = bold]
 "redis-bundle-0_start_0 undercloud" -> "redis:0_monitor_45000 redis-bundle-0" [ style = bold]
 "redis-bundle-0_start_0 undercloud" -> "redis:0_monitor_60000 redis-bundle-0" [ style = bold]
 "redis-bundle-0_start_0 undercloud" -> "redis:0_start_0 redis-bundle-0" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup.exp
@@ -173,9 +173,9 @@
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
+      <rsc_op id="19" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_30000" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="undercloud"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="undercloud"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -204,7 +204,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="undercloud"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="undercloud"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -334,9 +334,9 @@
   </synapse>
   <synapse id="23">
     <action_set>
-      <rsc_op id="41" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
+      <rsc_op id="41" operation="monitor" operation_key="galera-bundle-0_monitor_30000" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="undercloud"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="undercloud"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -365,7 +365,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="undercloud"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="undercloud"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -567,9 +567,9 @@
   </synapse>
   <synapse id="39">
     <action_set>
-      <rsc_op id="64" operation="monitor" operation_key="redis-bundle-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
+      <rsc_op id="64" operation="monitor" operation_key="redis-bundle-0_monitor_30000" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="undercloud"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="undercloud"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -598,7 +598,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="undercloud"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="undercloud"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-startup.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-startup.summary
@@ -82,7 +82,7 @@ Executing cluster transition:
  * Pseudo action:   redis-bundle_start_0
  * Resource action: rabbitmq:0      start on rabbitmq-bundle-0
  * Pseudo action:   rabbitmq-bundle-clone_running_0
- * Resource action: rabbitmq-bundle-0 monitor=60000 on undercloud
+ * Resource action: rabbitmq-bundle-0 monitor=30000 on undercloud
  * Pseudo action:   redis-bundle-master_start_0
  * Resource action: redis-bundle-docker-0 start on undercloud
  * Resource action: redis-bundle-0  monitor on undercloud
@@ -94,7 +94,7 @@ Executing cluster transition:
  * Pseudo action:   rabbitmq-bundle-clone_confirmed-post_notify_running_0
  * Resource action: redis:0         start on redis-bundle-0
  * Pseudo action:   redis-bundle-master_running_0
- * Resource action: redis-bundle-0  monitor=60000 on undercloud
+ * Resource action: redis-bundle-0  monitor=30000 on undercloud
  * Pseudo action:   rabbitmq-bundle_running_0
  * Resource action: rabbitmq:0      monitor=10000 on rabbitmq-bundle-0
  * Pseudo action:   redis-bundle-master_post_notify_running_0
@@ -111,7 +111,7 @@ Executing cluster transition:
  * Resource action: galera-bundle-0 start on undercloud
  * Resource action: galera:0        start on galera-bundle-0
  * Pseudo action:   galera-bundle-master_running_0
- * Resource action: galera-bundle-0 monitor=60000 on undercloud
+ * Resource action: galera-bundle-0 monitor=30000 on undercloud
  * Pseudo action:   galera-bundle_running_0
  * Resource action: galera:0        monitor=30000 on galera-bundle-0
  * Resource action: galera:0        monitor=20000 on galera-bundle-0
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-clone.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-stop-clone.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-clone.dot
@@ -4,8 +4,8 @@ digraph "g" {
 "galera-bundle-0_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-0_monitor_0 metal-3" -> "galera-bundle-0_start_0 metal-1" [ style = dashed]
 "galera-bundle-0_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_monitor_60000 metal-1" [ style=dashed color="red" fontcolor="black"]
-"galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_60000 metal-1" [ style = dashed]
+"galera-bundle-0_monitor_30000 metal-1" [ style=dashed color="red" fontcolor="black"]
+"galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_30000 metal-1" [ style = dashed]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_20000 galera-bundle-0" [ style = dashed]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_30000 galera-bundle-0" [ style = dashed]
 "galera-bundle-0_start_0 metal-1" -> "galera:0_start_0 galera-bundle-0" [ style = dashed]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-clone.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-stop-clone.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-clone.exp
@@ -275,7 +275,7 @@
     <action_set>
       <rsc_op id="37" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -284,7 +284,7 @@
     <action_set>
       <rsc_op id="33" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -293,7 +293,7 @@
     <action_set>
       <rsc_op id="38" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -302,7 +302,7 @@
     <action_set>
       <rsc_op id="29" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -311,7 +311,7 @@
     <action_set>
       <rsc_op id="34" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -320,7 +320,7 @@
     <action_set>
       <rsc_op id="30" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -329,7 +329,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -338,7 +338,7 @@
     <action_set>
       <rsc_op id="35" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -347,7 +347,7 @@
     <action_set>
       <rsc_op id="40" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -356,7 +356,7 @@
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -365,7 +365,7 @@
     <action_set>
       <rsc_op id="36" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -374,7 +374,7 @@
     <action_set>
       <rsc_op id="32" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="metal-3"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="metal-3"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-clone.xml
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-stop-clone.xml
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-clone.xml
@@ -224,11 +224,11 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="redis-bundle-0_last_0" operation_key="redis-bundle-0_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="cdc2746943a66a3b93738e3548dfc96d"/>
-            <lrm_rsc_op id="redis-bundle-0_monitor_60000" operation_key="redis-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="e1e2f8a6aaa00cc4f0e71adecd9e2301"/>
+            <lrm_rsc_op id="redis-bundle-0_monitor_30000" operation_key="redis-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="c940666e909d2a466bc9e3908ec137f5"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="504a42401176c2e94483b1e091f79a5a"/>
-            <lrm_rsc_op id="galera-bundle-0_monitor_60000" operation_key="galera-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="9901da5f8c52b9011a1b27b74e2c4eee"/>
+            <lrm_rsc_op id="galera-bundle-0_monitor_30000" operation_key="galera-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="9901da5f8c52b9011a1b27b74e2c4eee"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -273,11 +273,11 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="redis-bundle-1_last_0" operation_key="redis-bundle-1_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="40c70f9d61dc1fe2dba5a6fd7d5bd567"/>
-            <lrm_rsc_op id="redis-bundle-1_monitor_60000" operation_key="redis-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="869db8f221b6f9b135143fdc50dad3f4"/>
+            <lrm_rsc_op id="redis-bundle-1_monitor_30000" operation_key="redis-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="37aa58ee2ef2f5fc5a9e67e44f0145de"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="galera-bundle-1_last_0" operation_key="galera-bundle-1_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="912f68441e818e51b92b60f340f6faa5"/>
-            <lrm_rsc_op id="galera-bundle-1_monitor_60000" operation_key="galera-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="5f3d272e783249eaddff8c313cb262f9"/>
+            <lrm_rsc_op id="galera-bundle-1_monitor_30000" operation_key="galera-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="13faade612ff8785f57142d32a076778"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -322,11 +322,11 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="redis-bundle-2_last_0" operation_key="redis-bundle-2_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="3c205c3ee79f4db4f37351207ebff95e"/>
-            <lrm_rsc_op id="redis-bundle-2_monitor_60000" operation_key="redis-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="3786b0a658dcf4c2d3df6b2cea5cc84b"/>
+            <lrm_rsc_op id="redis-bundle-2_monitor_30000" operation_key="redis-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="787e79fbbd24d72a776d7b3f69553e3c"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="galera-bundle-2_last_0" operation_key="galera-bundle-2_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;1:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="b64c504325efb1370a8509833d3fe8ee"/>
-            <lrm_rsc_op id="galera-bundle-2_monitor_60000" operation_key="galera-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="011536401935dcba9470adbf1db4a633"/>
+            <lrm_rsc_op id="galera-bundle-2_monitor_30000" operation_key="galera-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="203b1e53b636c4d9affe6fe0973d1e0e"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-2.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-order-2.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-2.dot
@@ -1,5 +1,5 @@
 digraph "g" {
-"galera-bundle-0_monitor_60000 centos2" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-0_monitor_30000 centos2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-docker-1_monitor_0 centos2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-docker-2_monitor_0 centos1" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-docker-2_monitor_0 centos2" [ style=bold color="green" fontcolor="black"]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-2.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-order-2.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-2.exp
@@ -10,9 +10,9 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="17" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="centos2" on_node_uuid="2">
+      <rsc_op id="17" operation="monitor" operation_key="galera-bundle-0_monitor_30000" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="centos2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="centos2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-2.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-order-2.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-2.summary
@@ -13,7 +13,7 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: galera:0        monitor on galera-bundle-0
- * Resource action: galera-bundle-0 monitor=60000 on centos2
+ * Resource action: galera-bundle-0 monitor=30000 on centos2
  * Resource action: galera-bundle-docker-1 monitor on centos2
  * Resource action: galera-bundle-docker-2 monitor on centos3
  * Resource action: galera-bundle-docker-2 monitor on centos2
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-3.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-order-3.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-order-3.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="centos3" on_node_uuid="3">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="centos2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="centos2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="centos2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="centos2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="centos1" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="centos2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="centos2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-remotes.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-remotes.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-remotes.dot
@@ -85,10 +85,10 @@ digraph "g" {
 "scale1-bundle-0_monitor_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-0_monitor_0 c09-h07-r630" -> "scale1-bundle-0_start_0 c09-h05-r630" [ style = bold]
 "scale1-bundle-0_monitor_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
-"scale1-bundle-0_monitor_60000 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
+"scale1-bundle-0_monitor_30000 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-0_start_0 c09-h05-r630" -> "dummy1:0_monitor_10000 scale1-bundle-0" [ style = bold]
 "scale1-bundle-0_start_0 c09-h05-r630" -> "dummy1:0_start_0 scale1-bundle-0" [ style = bold]
-"scale1-bundle-0_start_0 c09-h05-r630" -> "scale1-bundle-0_monitor_60000 c09-h05-r630" [ style = bold]
+"scale1-bundle-0_start_0 c09-h05-r630" -> "scale1-bundle-0_monitor_30000 c09-h05-r630" [ style = bold]
 "scale1-bundle-0_start_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-1_monitor_0 c09-h05-r630" -> "scale1-bundle-1_start_0 c09-h06-r630" [ style = bold]
 "scale1-bundle-1_monitor_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
@@ -96,10 +96,10 @@ digraph "g" {
 "scale1-bundle-1_monitor_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-1_monitor_0 c09-h07-r630" -> "scale1-bundle-1_start_0 c09-h06-r630" [ style = bold]
 "scale1-bundle-1_monitor_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
-"scale1-bundle-1_monitor_60000 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
+"scale1-bundle-1_monitor_30000 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-1_start_0 c09-h06-r630" -> "dummy1:1_monitor_10000 scale1-bundle-1" [ style = bold]
 "scale1-bundle-1_start_0 c09-h06-r630" -> "dummy1:1_start_0 scale1-bundle-1" [ style = bold]
-"scale1-bundle-1_start_0 c09-h06-r630" -> "scale1-bundle-1_monitor_60000 c09-h06-r630" [ style = bold]
+"scale1-bundle-1_start_0 c09-h06-r630" -> "scale1-bundle-1_monitor_30000 c09-h06-r630" [ style = bold]
 "scale1-bundle-1_start_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-2_monitor_0 c09-h05-r630" -> "scale1-bundle-2_start_0 c09-h07-r630" [ style = bold]
 "scale1-bundle-2_monitor_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
@@ -107,10 +107,10 @@ digraph "g" {
 "scale1-bundle-2_monitor_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-2_monitor_0 c09-h07-r630" -> "scale1-bundle-2_start_0 c09-h07-r630" [ style = bold]
 "scale1-bundle-2_monitor_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
-"scale1-bundle-2_monitor_60000 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
+"scale1-bundle-2_monitor_30000 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-2_start_0 c09-h07-r630" -> "dummy1:2_monitor_10000 scale1-bundle-2" [ style = bold]
 "scale1-bundle-2_start_0 c09-h07-r630" -> "dummy1:2_start_0 scale1-bundle-2" [ style = bold]
-"scale1-bundle-2_start_0 c09-h07-r630" -> "scale1-bundle-2_monitor_60000 c09-h07-r630" [ style = bold]
+"scale1-bundle-2_start_0 c09-h07-r630" -> "scale1-bundle-2_monitor_30000 c09-h07-r630" [ style = bold]
 "scale1-bundle-2_start_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-3_monitor_0 c09-h05-r630" -> "scale1-bundle-3_start_0 c09-h05-r630" [ style = bold]
 "scale1-bundle-3_monitor_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
@@ -118,10 +118,10 @@ digraph "g" {
 "scale1-bundle-3_monitor_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-3_monitor_0 c09-h07-r630" -> "scale1-bundle-3_start_0 c09-h05-r630" [ style = bold]
 "scale1-bundle-3_monitor_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
-"scale1-bundle-3_monitor_60000 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
+"scale1-bundle-3_monitor_30000 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-3_start_0 c09-h05-r630" -> "dummy1:3_monitor_10000 scale1-bundle-3" [ style = bold]
 "scale1-bundle-3_start_0 c09-h05-r630" -> "dummy1:3_start_0 scale1-bundle-3" [ style = bold]
-"scale1-bundle-3_start_0 c09-h05-r630" -> "scale1-bundle-3_monitor_60000 c09-h05-r630" [ style = bold]
+"scale1-bundle-3_start_0 c09-h05-r630" -> "scale1-bundle-3_monitor_30000 c09-h05-r630" [ style = bold]
 "scale1-bundle-3_start_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-4_monitor_0 c09-h05-r630" -> "scale1-bundle-4_start_0 c09-h06-r630" [ style = bold]
 "scale1-bundle-4_monitor_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
@@ -129,10 +129,10 @@ digraph "g" {
 "scale1-bundle-4_monitor_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-4_monitor_0 c09-h07-r630" -> "scale1-bundle-4_start_0 c09-h06-r630" [ style = bold]
 "scale1-bundle-4_monitor_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
-"scale1-bundle-4_monitor_60000 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
+"scale1-bundle-4_monitor_30000 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-4_start_0 c09-h06-r630" -> "dummy1:4_monitor_10000 scale1-bundle-4" [ style = bold]
 "scale1-bundle-4_start_0 c09-h06-r630" -> "dummy1:4_start_0 scale1-bundle-4" [ style = bold]
-"scale1-bundle-4_start_0 c09-h06-r630" -> "scale1-bundle-4_monitor_60000 c09-h06-r630" [ style = bold]
+"scale1-bundle-4_start_0 c09-h06-r630" -> "scale1-bundle-4_monitor_30000 c09-h06-r630" [ style = bold]
 "scale1-bundle-4_start_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-5_monitor_0 c09-h05-r630" -> "scale1-bundle-5_start_0 c09-h07-r630" [ style = bold]
 "scale1-bundle-5_monitor_0 c09-h05-r630" [ style=bold color="green" fontcolor="black"]
@@ -140,10 +140,10 @@ digraph "g" {
 "scale1-bundle-5_monitor_0 c09-h06-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-5_monitor_0 c09-h07-r630" -> "scale1-bundle-5_start_0 c09-h07-r630" [ style = bold]
 "scale1-bundle-5_monitor_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
-"scale1-bundle-5_monitor_60000 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
+"scale1-bundle-5_monitor_30000 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-5_start_0 c09-h07-r630" -> "dummy1:5_monitor_10000 scale1-bundle-5" [ style = bold]
 "scale1-bundle-5_start_0 c09-h07-r630" -> "dummy1:5_start_0 scale1-bundle-5" [ style = bold]
-"scale1-bundle-5_start_0 c09-h07-r630" -> "scale1-bundle-5_monitor_60000 c09-h07-r630" [ style = bold]
+"scale1-bundle-5_start_0 c09-h07-r630" -> "scale1-bundle-5_monitor_30000 c09-h07-r630" [ style = bold]
 "scale1-bundle-5_start_0 c09-h07-r630" [ style=bold color="green" fontcolor="black"]
 "scale1-bundle-clone_running_0" -> "scale1-bundle_running_0" [ style = bold]
 "scale1-bundle-clone_running_0" [ style=bold color="green" fontcolor="orange"]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-remotes.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-remotes.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-remotes.exp
@@ -678,9 +678,9 @@
   </synapse>
   <synapse id="37">
     <action_set>
-      <rsc_op id="74" operation="monitor" operation_key="scale1-bundle-0_monitor_60000" on_node="c09-h05-r630" on_node_uuid="1">
+      <rsc_op id="74" operation="monitor" operation_key="scale1-bundle-0_monitor_30000" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="c09-h05-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="c09-h05-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -715,7 +715,7 @@
     <action_set>
       <rsc_op id="36" operation="monitor" operation_key="scale1-bundle-0_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h05-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h05-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -728,7 +728,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="scale1-bundle-0_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h05-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h05-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -741,7 +741,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="scale1-bundle-0_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h05-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-0" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h05-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -877,9 +877,9 @@
   </synapse>
   <synapse id="50">
     <action_set>
-      <rsc_op id="78" operation="monitor" operation_key="scale1-bundle-1_monitor_60000" on_node="c09-h06-r630" on_node_uuid="2">
+      <rsc_op id="78" operation="monitor" operation_key="scale1-bundle-1_monitor_30000" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="c09-h06-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="c09-h06-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -914,7 +914,7 @@
     <action_set>
       <rsc_op id="38" operation="monitor" operation_key="scale1-bundle-1_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h06-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h06-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -927,7 +927,7 @@
     <action_set>
       <rsc_op id="23" operation="monitor" operation_key="scale1-bundle-1_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h06-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h06-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -940,7 +940,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="scale1-bundle-1_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h06-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-1" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h06-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1076,9 +1076,9 @@
   </synapse>
   <synapse id="63">
     <action_set>
-      <rsc_op id="82" operation="monitor" operation_key="scale1-bundle-2_monitor_60000" on_node="c09-h07-r630" on_node_uuid="3">
+      <rsc_op id="82" operation="monitor" operation_key="scale1-bundle-2_monitor_30000" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" addr="c09-h07-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="c09-h07-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1113,7 +1113,7 @@
     <action_set>
       <rsc_op id="40" operation="monitor" operation_key="scale1-bundle-2_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h07-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h07-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1126,7 +1126,7 @@
     <action_set>
       <rsc_op id="25" operation="monitor" operation_key="scale1-bundle-2_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h07-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h07-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1139,7 +1139,7 @@
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="scale1-bundle-2_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h07-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-2" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h07-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1281,9 +1281,9 @@
   </synapse>
   <synapse id="76">
     <action_set>
-      <rsc_op id="86" operation="monitor" operation_key="scale1-bundle-3_monitor_60000" on_node="c09-h05-r630" on_node_uuid="1">
+      <rsc_op id="86" operation="monitor" operation_key="scale1-bundle-3_monitor_30000" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-3" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="c09-h08-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="c09-h08-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1318,7 +1318,7 @@
     <action_set>
       <rsc_op id="42" operation="monitor" operation_key="scale1-bundle-3_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-3" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h08-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h08-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1331,7 +1331,7 @@
     <action_set>
       <rsc_op id="27" operation="monitor" operation_key="scale1-bundle-3_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-3" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h08-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h08-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1344,7 +1344,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="scale1-bundle-3_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-3" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h08-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-3" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h08-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1486,9 +1486,9 @@
   </synapse>
   <synapse id="89">
     <action_set>
-      <rsc_op id="90" operation="monitor" operation_key="scale1-bundle-4_monitor_60000" on_node="c09-h06-r630" on_node_uuid="2">
+      <rsc_op id="90" operation="monitor" operation_key="scale1-bundle-4_monitor_30000" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-4" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="c09-h09-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="c09-h09-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1523,7 +1523,7 @@
     <action_set>
       <rsc_op id="44" operation="monitor" operation_key="scale1-bundle-4_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-4" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h09-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h09-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1536,7 +1536,7 @@
     <action_set>
       <rsc_op id="29" operation="monitor" operation_key="scale1-bundle-4_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-4" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h09-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h09-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1549,7 +1549,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="scale1-bundle-4_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-4" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h09-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-4" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h09-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1691,9 +1691,9 @@
   </synapse>
   <synapse id="102">
     <action_set>
-      <rsc_op id="94" operation="monitor" operation_key="scale1-bundle-5_monitor_60000" on_node="c09-h07-r630" on_node_uuid="3">
+      <rsc_op id="94" operation="monitor" operation_key="scale1-bundle-5_monitor_30000" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-5" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" addr="c09-h10-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="c09-h10-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1728,7 +1728,7 @@
     <action_set>
       <rsc_op id="46" operation="monitor" operation_key="scale1-bundle-5_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-5" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h10-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h10-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1741,7 +1741,7 @@
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="scale1-bundle-5_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-5" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h10-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h10-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1754,7 +1754,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="scale1-bundle-5_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-5" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="c09-h10-r630"  port="3131"/>
+        <attributes CRM_meta_container="scale1-bundle-docker-5" CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="c09-h10-r630"  port="3131"/>
       </rsc_op>
     </action_set>
     <inputs>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-remotes.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-probe-remotes.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-probe-remotes.summary
@@ -134,12 +134,12 @@ Executing cluster transition:
  * Resource action: dummy1:4        start on scale1-bundle-4
  * Resource action: dummy1:5        start on scale1-bundle-5
  * Pseudo action:   scale1-bundle-clone_running_0
- * Resource action: scale1-bundle-0 monitor=60000 on c09-h05-r630
- * Resource action: scale1-bundle-1 monitor=60000 on c09-h06-r630
- * Resource action: scale1-bundle-2 monitor=60000 on c09-h07-r630
- * Resource action: scale1-bundle-3 monitor=60000 on c09-h05-r630
- * Resource action: scale1-bundle-4 monitor=60000 on c09-h06-r630
- * Resource action: scale1-bundle-5 monitor=60000 on c09-h07-r630
+ * Resource action: scale1-bundle-0 monitor=30000 on c09-h05-r630
+ * Resource action: scale1-bundle-1 monitor=30000 on c09-h06-r630
+ * Resource action: scale1-bundle-2 monitor=30000 on c09-h07-r630
+ * Resource action: scale1-bundle-3 monitor=30000 on c09-h05-r630
+ * Resource action: scale1-bundle-4 monitor=30000 on c09-h06-r630
+ * Resource action: scale1-bundle-5 monitor=30000 on c09-h07-r630
  * Pseudo action:   scale1-bundle_running_0
  * Resource action: dummy1:0        monitor=10000 on scale1-bundle-0
  * Resource action: dummy1:1        monitor=10000 on scale1-bundle-1
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/remote-fence-unclean-3.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/remote-fence-unclean-3.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/remote-fence-unclean-3.exp
@@ -77,7 +77,7 @@
     <action_set>
       <rsc_op id="58" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -86,7 +86,7 @@
     <action_set>
       <rsc_op id="51" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-0"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-0"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -95,7 +95,7 @@
     <action_set>
       <rsc_op id="59" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -104,7 +104,7 @@
     <action_set>
       <rsc_op id="44" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-1"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-1"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -113,7 +113,7 @@
     <action_set>
       <rsc_op id="52" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -122,7 +122,7 @@
     <action_set>
       <rsc_op id="45" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-2"  port="3121"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-2"  port="3121"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -131,7 +131,7 @@
     <action_set>
       <rsc_op id="60" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-0"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -140,7 +140,7 @@
     <action_set>
       <rsc_op id="53" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-0"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -149,7 +149,7 @@
     <action_set>
       <rsc_op id="61" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -158,7 +158,7 @@
     <action_set>
       <rsc_op id="46" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-1"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-1"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -167,7 +167,7 @@
     <action_set>
       <rsc_op id="54" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -176,7 +176,7 @@
     <action_set>
       <rsc_op id="47" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -185,7 +185,7 @@
     <action_set>
       <rsc_op id="62" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-0"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-0"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -194,7 +194,7 @@
     <action_set>
       <rsc_op id="55" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-0"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-0"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -203,7 +203,7 @@
     <action_set>
       <rsc_op id="63" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="overcloud-controller-2" on_node_uuid="3">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="overcloud-controller-2" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -212,7 +212,7 @@
     <action_set>
       <rsc_op id="48" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -221,7 +221,7 @@
     <action_set>
       <rsc_op id="56" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="overcloud-controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="overcloud-controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -230,7 +230,7 @@
     <action_set>
       <rsc_op id="49" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="overcloud-controller-2"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="overcloud-controller-2"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/remote-fence-unclean-3.xml
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/remote-fence-unclean-3.xml
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/remote-fence-unclean-3.xml
@@ -407,7 +407,7 @@
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-2" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-2">
             <lrm_rsc_op id="rabbitmq-bundle-2_last_0" operation_key="rabbitmq-bundle-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="15:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;15:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="0" queue-time="0" op-digest="a85a038c2aaf9611b0123a922f6cc61f" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-2_monitor_60000" operation_key="rabbitmq-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="19:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;19:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668699" exec-time="0" queue-time="0" op-digest="d045859aac223f9d6c1d9ea38434827f"/>
+            <lrm_rsc_op id="rabbitmq-bundle-2_monitor_30000" operation_key="rabbitmq-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="19:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;19:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668699" exec-time="0" queue-time="0" op-digest="71cc30d5f46fb9c817d01e012997d21d"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="15:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;15:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="28" rc-code="7" op-status="0" interval="0" last-run="1498668716" last-rc-change="1498668716" exec-time="22" queue-time="0" op-digest="cea4042997161052606b12bff643218c"/>
@@ -421,7 +421,7 @@
           </lrm_resource>
           <lrm_resource id="galera-bundle-2" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-2">
             <lrm_rsc_op id="galera-bundle-2_last_0" operation_key="galera-bundle-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="45:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;45:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1498668758" last-rc-change="1498668758" exec-time="0" queue-time="0" op-digest="3f90661d608748039031eecf1b1eccec" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-2_monitor_60000" operation_key="galera-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="50:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;50:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668781" exec-time="0" queue-time="0" op-digest="be2946c3b0185392bb481388655bb5ee"/>
+            <lrm_rsc_op id="galera-bundle-2_monitor_30000" operation_key="galera-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="50:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;50:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668781" exec-time="0" queue-time="0" op-digest="24b70de14475baa3a07d5d0978d0a7aa"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="26:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;26:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="43" rc-code="7" op-status="0" interval="0" last-run="1498668877" last-rc-change="1498668877" exec-time="32" queue-time="0" op-digest="6b370e7f473758a477ba7ba1a1d14fed"/>
@@ -435,7 +435,7 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-2" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-2">
             <lrm_rsc_op id="redis-bundle-2_last_0" operation_key="redis-bundle-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="87:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;87:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1498668899" last-rc-change="1498668899" exec-time="0" queue-time="0" op-digest="5d2d2dc6340136c5c4c289d812a6e489" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-2_monitor_60000" operation_key="redis-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="91:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;91:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668901" exec-time="0" queue-time="0" op-digest="c11ea9bf482bc6a194ff26b1f3d81523"/>
+            <lrm_rsc_op id="redis-bundle-2_monitor_30000" operation_key="redis-bundle-2_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="91:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;91:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668901" exec-time="0" queue-time="0" op-digest="dccbe4c02ae92a396cbf64641986f927"/>
           </lrm_resource>
           <lrm_resource id="ip-192.168.24.9" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-192.168.24.9_last_0" operation_key="ip-192.168.24.9_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="33:30:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;33:30:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="62" rc-code="7" op-status="0" interval="0" last-run="1498668920" last-rc-change="1498668920" exec-time="33" queue-time="0" op-digest="fe7a4d69e1427ab8b5c436557ecc8780"/>
@@ -499,7 +499,7 @@
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-1" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-1">
             <lrm_rsc_op id="rabbitmq-bundle-1_last_0" operation_key="rabbitmq-bundle-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="12:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;12:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="0" queue-time="0" op-digest="960e0dbbd69f1d30f1b690e4262fd8af" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-1_monitor_60000" operation_key="rabbitmq-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;14:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668699" exec-time="0" queue-time="0" op-digest="258066a792cfce7951cf9f0634dc1e8c"/>
+            <lrm_rsc_op id="rabbitmq-bundle-1_monitor_30000" operation_key="rabbitmq-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;14:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668699" exec-time="0" queue-time="0" op-digest="1ca5a6ebc23f42ea5e2d399f0a3d4bc6"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="13:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;13:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1498668757" last-rc-change="1498668757" exec-time="328" queue-time="0" op-digest="9be25018e115be06a50f1d7fdb69cb66"/>
@@ -513,7 +513,7 @@
           </lrm_resource>
           <lrm_resource id="galera-bundle-1" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-1">
             <lrm_rsc_op id="galera-bundle-1_last_0" operation_key="galera-bundle-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="42:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;42:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1498668758" last-rc-change="1498668758" exec-time="0" queue-time="0" op-digest="3f1ea261ff34138fb419e6c80d7c1e4a" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-1_monitor_60000" operation_key="galera-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="45:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;45:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668781" exec-time="0" queue-time="0" op-digest="466eb8d1221d4e484215032e6b038349"/>
+            <lrm_rsc_op id="galera-bundle-1_monitor_30000" operation_key="galera-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="45:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;45:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668781" exec-time="0" queue-time="0" op-digest="e6e2aa4149b4068953b8cd5399862adc"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="redis-bundle-docker-2_last_0" operation_key="redis-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="25:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;25:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="51" rc-code="7" op-status="0" interval="0" last-run="1498668877" last-rc-change="1498668877" exec-time="21" queue-time="0" op-digest="6b370e7f473758a477ba7ba1a1d14fed"/>
@@ -527,7 +527,7 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-1" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-1">
             <lrm_rsc_op id="redis-bundle-1_last_0" operation_key="redis-bundle-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="84:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;84:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1498668899" last-rc-change="1498668899" exec-time="0" queue-time="0" op-digest="95609f52b711714180c18c3648531e42" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-1_monitor_60000" operation_key="redis-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="86:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;86:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668901" exec-time="0" queue-time="0" op-digest="7d0de033747ee83d415141819bae6146"/>
+            <lrm_rsc_op id="redis-bundle-1_monitor_30000" operation_key="redis-bundle-1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="86:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;86:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668901" exec-time="0" queue-time="0" op-digest="868215cd0c0fe478e61a37b30ad9ff77"/>
           </lrm_resource>
           <lrm_resource id="ip-192.168.24.9" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-192.168.24.9_last_0" operation_key="ip-192.168.24.9_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="32:30:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;32:30:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="62" rc-code="7" op-status="0" interval="0" last-run="1498668920" last-rc-change="1498668920" exec-time="46" queue-time="0" op-digest="fe7a4d69e1427ab8b5c436557ecc8780"/>
@@ -592,7 +592,7 @@
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-0" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-0">
             <lrm_rsc_op id="rabbitmq-bundle-0_last_0" operation_key="rabbitmq-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="9:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;9:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="1" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="0" queue-time="0" op-digest="06bf2981855453761a1523f54ea00d6b" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_60000" operation_key="rabbitmq-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="9:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;9:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="2" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668699" exec-time="0" queue-time="0" op-digest="64efd39f257c2f9fd720113e46f87aca"/>
+            <lrm_rsc_op id="rabbitmq-bundle-0_monitor_30000" operation_key="rabbitmq-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="9:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;9:9:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="2" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668699" exec-time="0" queue-time="0" op-digest="78b95cbf8c9264f59a13a712d711a122"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;14:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1498668757" last-rc-change="1498668757" exec-time="342" queue-time="0" op-digest="a25a3351a7fd1a430a6a8991da64de98"/>
@@ -606,7 +606,7 @@
           </lrm_resource>
           <lrm_resource id="galera-bundle-0" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-0">
             <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;39:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1498668758" last-rc-change="1498668758" exec-time="0" queue-time="0" op-digest="d76a68ec298b67d7ce279021bac270e3" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="galera-bundle-0_monitor_60000" operation_key="galera-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;40:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="4" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668781" exec-time="0" queue-time="0" op-digest="41bc06f1f57d6510ee85b7eba6517257"/>
+            <lrm_rsc_op id="galera-bundle-0_monitor_30000" operation_key="galera-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;40:12:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668781" exec-time="0" queue-time="0" op-digest="410d64eb209a936ee390f6eb0308bafb"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="25:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;25:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="56" rc-code="0" op-status="0" interval="0" last-run="1498668899" last-rc-change="1498668899" exec-time="335" queue-time="0" op-digest="b26392b2cfc73ee1c83c6bb1ec2aa4c7"/>
@@ -620,7 +620,7 @@
           </lrm_resource>
           <lrm_resource id="redis-bundle-0" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-0">
             <lrm_rsc_op id="redis-bundle-0_last_0" operation_key="redis-bundle-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="81:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;81:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1498668899" last-rc-change="1498668899" exec-time="0" queue-time="0" op-digest="06c11926bd689828bab73e1743a3b004" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="redis-bundle-0_monitor_60000" operation_key="redis-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="81:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;81:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="6" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668901" exec-time="0" queue-time="0" op-digest="69f25cce618ac234bdbdeee7c2a3913e"/>
+            <lrm_rsc_op id="redis-bundle-0_monitor_30000" operation_key="redis-bundle-0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="81:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;81:25:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="6" rc-code="0" op-status="0" interval="30000" last-rc-change="1498668901" exec-time="0" queue-time="0" op-digest="555e2cf5c335ea7eb9ba16b66db1e4ba"/>
           </lrm_resource>
           <lrm_resource id="ip-192.168.24.9" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-192.168.24.9_last_0" operation_key="ip-192.168.24.9_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="113:32:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;113:32:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="63" rc-code="0" op-status="0" interval="0" last-run="1498668923" last-rc-change="1498668923" exec-time="4069" queue-time="0" op-digest="fe7a4d69e1427ab8b5c436557ecc8780"/>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-on-remote.dot
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-stop-on-remote.dot
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-on-remote.dot
@@ -1,4 +1,10 @@
 digraph "g" {
+"Cancel galera-bundle-1_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
+"Cancel rabbitmq-bundle-0_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
+"Cancel rabbitmq-bundle-1_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
+"Cancel rabbitmq-bundle-2_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
+"Cancel redis-bundle-0_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
+"Cancel redis-bundle-2_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "database-0_monitor_20000 controller-0" [ style=bold color="green" fontcolor="black"]
 "database-0_start_0 controller-0" -> "database-0_monitor_20000 controller-0" [ style = bold]
@@ -14,16 +20,17 @@ digraph "g" {
 "database-2_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-0_monitor_0 controller-1" -> "galera-bundle-0_start_0 controller-0" [ style = bold]
 "galera-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-0_start_0 controller-0" -> "galera-bundle-0_monitor_60000 controller-0" [ style = bold]
+"galera-bundle-0_monitor_30000 controller-0" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-0_start_0 controller-0" -> "galera-bundle-0_monitor_30000 controller-0" [ style = bold]
 "galera-bundle-0_start_0 controller-0" -> "galera_monitor_10000 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 controller-0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 controller-0" -> "galera_start_0 galera-bundle-0" [ style = bold]
 "galera-bundle-0_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-1_monitor_30000 controller-2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-2_monitor_0 controller-1" -> "galera-bundle-2_start_0 controller-1" [ style = bold]
 "galera-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-2_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-2_start_0 controller-1" -> "galera-bundle-2_monitor_60000 controller-1" [ style = bold]
+"galera-bundle-2_monitor_30000 controller-1" [ style=bold color="green" fontcolor="black"]
+"galera-bundle-2_start_0 controller-1" -> "galera-bundle-2_monitor_30000 controller-1" [ style = bold]
 "galera-bundle-2_start_0 controller-1" -> "galera_monitor_10000 galera-bundle-2" [ style = bold]
 "galera-bundle-2_start_0 controller-1" -> "galera_promote_0 galera-bundle-2" [ style = bold]
 "galera-bundle-2_start_0 controller-1" -> "galera_start_0 galera-bundle-2" [ style = bold]
@@ -168,14 +175,19 @@ digraph "g" {
 "openstack-cinder-volume_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
 "openstack-cinder-volume_start_0 controller-0" -> "openstack-cinder-volume_monitor_60000 controller-0" [ style = bold]
 "openstack-cinder-volume_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-0_monitor_30000 controller-2" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-1_monitor_30000 controller-2" [ style=bold color="green" fontcolor="black"]
+"rabbitmq-bundle-2_monitor_30000 controller-2" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-0_monitor_30000 controller-0" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-1_monitor_0 controller-1" -> "redis-bundle-1_start_0 controller-1" [ style = bold]
 "redis-bundle-1_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-1_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"redis-bundle-1_start_0 controller-1" -> "redis-bundle-1_monitor_60000 controller-1" [ style = bold]
+"redis-bundle-1_monitor_30000 controller-1" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-1_start_0 controller-1" -> "redis-bundle-1_monitor_30000 controller-1" [ style = bold]
 "redis-bundle-1_start_0 controller-1" -> "redis:1_monitor_45000 redis-bundle-1" [ style = bold]
 "redis-bundle-1_start_0 controller-1" -> "redis:1_monitor_60000 redis-bundle-1" [ style = bold]
 "redis-bundle-1_start_0 controller-1" -> "redis:1_start_0 redis-bundle-1" [ style = bold]
 "redis-bundle-1_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
+"redis-bundle-2_monitor_30000 controller-2" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-docker-1_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
 "redis-bundle-docker-1_start_0 controller-1" -> "redis-bundle-1_monitor_0 controller-1" [ style = bold]
 "redis-bundle-docker-1_start_0 controller-1" -> "redis-bundle-1_start_0 controller-1" [ style = bold]
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-on-remote.exp
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-stop-on-remote.exp
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-on-remote.exp
@@ -45,358 +45,412 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="110" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:0_monitor_10000" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
+      <rsc_op id="54" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_30000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="messaging-0"  port="3122"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="5">
+    <action_set>
+      <rsc_op id="10" operation="cancel" operation_key="rabbitmq-bundle-0_monitor_60000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_call_id="33" CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_operation="monitor" CRM_meta_timeout="30000" addr="messaging-0"  port="3122"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="6">
+    <action_set>
+      <rsc_op id="59" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_30000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="messaging-1"  port="3122"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="7">
+    <action_set>
+      <rsc_op id="11" operation="cancel" operation_key="rabbitmq-bundle-1_monitor_60000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_call_id="27" CRM_meta_container="rabbitmq-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_operation="monitor" CRM_meta_timeout="30000" addr="messaging-1"  port="3122"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="8">
+    <action_set>
+      <rsc_op id="64" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_30000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="messaging-2"  port="3122"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="9">
+    <action_set>
+      <rsc_op id="12" operation="cancel" operation_key="rabbitmq-bundle-2_monitor_60000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_call_id="28" CRM_meta_container="rabbitmq-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_operation="monitor" CRM_meta_timeout="30000" addr="messaging-2"  port="3122"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="10">
+    <action_set>
+      <rsc_op id="114" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:0_monitor_10000" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
         <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_op_target_rc="8" CRM_meta_physical_host="database-0" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="90" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="112" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="109" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="113" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="11">
     <action_set>
-      <rsc_op id="109" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
+      <rsc_op id="113" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
         <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_physical_host="database-0" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="90" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
+        <pseudo_event id="110" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="112" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="120" operation="promote" operation_key="galera-bundle-master_promote_0"/>
+        <pseudo_event id="124" operation="promote" operation_key="galera-bundle-master_promote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6">
+  <synapse id="12">
     <action_set>
-      <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
+      <rsc_op id="112" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
         <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_physical_host="database-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="90" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
+        <pseudo_event id="111" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0"/>
+        <pseudo_event id="120" operation="start" operation_key="galera-bundle-master_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="7">
+  <synapse id="13">
     <action_set>
-      <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0">
+      <pseudo_event id="111" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_physical_host="database-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="104" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
+        <pseudo_event id="110" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
+        <pseudo_event id="116" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0"/>
+        <pseudo_event id="122" operation="stop" operation_key="galera-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="8">
+  <synapse id="14">
     <action_set>
-      <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0">
+      <pseudo_event id="110" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_physical_host="database-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0"/>
+        <pseudo_event id="126" operation="demote" operation_key="galera-bundle-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="9">
+  <synapse id="15">
     <action_set>
-      <rsc_op id="115" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:2_monitor_10000" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
+      <rsc_op id="119" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:2_monitor_10000" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
         <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_op_target_rc="8" CRM_meta_physical_host="database-2" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="100" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
+        <rsc_op id="117" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="114" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
+        <rsc_op id="118" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="16">
     <action_set>
-      <rsc_op id="114" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
+      <rsc_op id="118" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
         <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_physical_host="database-2" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="100" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
+        <pseudo_event id="115" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
+        <rsc_op id="117" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="120" operation="promote" operation_key="galera-bundle-master_promote_0"/>
+        <pseudo_event id="124" operation="promote" operation_key="galera-bundle-master_promote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="11">
+  <synapse id="17">
     <action_set>
-      <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
+      <rsc_op id="117" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
         <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_physical_host="database-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="100" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="112" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
+        <pseudo_event id="116" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0"/>
+        <pseudo_event id="120" operation="start" operation_key="galera-bundle-master_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="12">
+  <synapse id="18">
     <action_set>
-      <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0">
+      <pseudo_event id="116" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0">
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_physical_host="database-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="104" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
+        <pseudo_event id="115" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0"/>
+        <pseudo_event id="122" operation="stop" operation_key="galera-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="13">
+  <synapse id="19">
     <action_set>
-      <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0">
+      <pseudo_event id="115" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0">
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_physical_host="database-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0"/>
+        <pseudo_event id="126" operation="demote" operation_key="galera-bundle-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="14" priority="1000000">
+  <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0">
+      <pseudo_event id="127" operation="demoted" operation_key="galera-bundle-master_demoted_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
+        <pseudo_event id="110" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
+        <pseudo_event id="115" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0"/>
+        <pseudo_event id="126" operation="demote" operation_key="galera-bundle-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="15">
+  <synapse id="21">
     <action_set>
-      <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0">
+      <pseudo_event id="126" operation="demote" operation_key="galera-bundle-master_demote_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="126" operation="demote" operation_key="galera-bundle_demote_0"/>
+        <pseudo_event id="130" operation="demote" operation_key="galera-bundle_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="16" priority="1000000">
+  <synapse id="22" priority="1000000">
     <action_set>
-      <pseudo_event id="121" operation="promoted" operation_key="galera-bundle-master_promoted_0">
+      <pseudo_event id="125" operation="promoted" operation_key="galera-bundle-master_promoted_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="109" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="113" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="114" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
+        <rsc_op id="118" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="17">
+  <synapse id="23">
     <action_set>
-      <pseudo_event id="120" operation="promote" operation_key="galera-bundle-master_promote_0">
+      <pseudo_event id="124" operation="promote" operation_key="galera-bundle-master_promote_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="117" operation="running" operation_key="galera-bundle-master_running_0"/>
+        <pseudo_event id="121" operation="running" operation_key="galera-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
+        <pseudo_event id="123" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="124" operation="promote" operation_key="galera-bundle_promote_0"/>
+        <pseudo_event id="128" operation="promote" operation_key="galera-bundle_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="18" priority="1000000">
+  <synapse id="24" priority="1000000">
     <action_set>
-      <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0">
+      <pseudo_event id="123" operation="stopped" operation_key="galera-bundle-master_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
+        <pseudo_event id="111" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
+        <pseudo_event id="116" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0"/>
+        <pseudo_event id="122" operation="stop" operation_key="galera-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="19">
+  <synapse id="25">
     <action_set>
-      <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0">
+      <pseudo_event id="122" operation="stop" operation_key="galera-bundle-master_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="104" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="224" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
+        <pseudo_event id="230" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="225" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2"/>
+        <pseudo_event id="231" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="20" priority="1000000">
+  <synapse id="26" priority="1000000">
     <action_set>
-      <pseudo_event id="117" operation="running" operation_key="galera-bundle-master_running_0">
+      <pseudo_event id="121" operation="running" operation_key="galera-bundle-master_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="112" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
+        <rsc_op id="117" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0"/>
+        <pseudo_event id="120" operation="start" operation_key="galera-bundle-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="21">
+  <synapse id="27">
     <action_set>
-      <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0">
+      <pseudo_event id="120" operation="start" operation_key="galera-bundle-master_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0"/>
+        <pseudo_event id="102" operation="start" operation_key="galera-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
+        <pseudo_event id="123" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="22">
+  <synapse id="28">
     <action_set>
-      <rsc_op id="86" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
+      <rsc_op id="89" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -406,13 +460,13 @@
         <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="23">
+  <synapse id="29">
     <action_set>
-      <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
+      <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -422,19 +476,19 @@
         <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="87" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0"/>
+        <pseudo_event id="102" operation="start" operation_key="galera-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="24">
+  <synapse id="30">
     <action_set>
-      <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
+      <rsc_op id="87" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -444,26 +498,26 @@
         <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="104" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="25">
+  <synapse id="31">
     <action_set>
-      <rsc_op id="88" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="91" operation="monitor" operation_key="galera-bundle-0_monitor_30000" on_node="controller-0" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="database-0"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="database-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="90" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="26">
+  <synapse id="32">
     <action_set>
-      <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="90" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="database-0"  port="3123"/>
       </rsc_op>
@@ -473,26 +527,44 @@
         <rsc_op id="35" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="27">
+  <synapse id="33">
     <action_set>
       <rsc_op id="35" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="database-0"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="database-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="28">
+  <synapse id="34">
     <action_set>
-      <rsc_op id="95" operation="monitor" operation_key="galera-bundle-docker-2_monitor_60000" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
+      <rsc_op id="96" operation="monitor" operation_key="galera-bundle-1_monitor_30000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_container="galera-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="database-1"  port="3123"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="35">
+    <action_set>
+      <rsc_op id="18" operation="cancel" operation_key="galera-bundle-1_monitor_60000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_call_id="29" CRM_meta_container="galera-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_operation="monitor" CRM_meta_timeout="30000" addr="database-1"  port="3123"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="36">
+    <action_set>
+      <rsc_op id="99" operation="monitor" operation_key="galera-bundle-docker-2_monitor_60000" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="database-2" CRM_meta_on_node_uuid="database-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -502,13 +574,13 @@
         <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="29">
+  <synapse id="37">
     <action_set>
-      <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
+      <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="database-2" CRM_meta_on_node_uuid="database-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -518,19 +590,19 @@
         <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="97" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0"/>
+        <pseudo_event id="102" operation="start" operation_key="galera-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="30">
+  <synapse id="38">
     <action_set>
-      <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
+      <rsc_op id="97" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="database-2" CRM_meta_on_node_uuid="database-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -540,26 +612,26 @@
         <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="104" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="31">
+  <synapse id="39">
     <action_set>
-      <rsc_op id="97" operation="monitor" operation_key="galera-bundle-2_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="101" operation="monitor" operation_key="galera-bundle-2_monitor_30000" on_node="controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="database-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="database-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="100" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="32">
+  <synapse id="40">
     <action_set>
-      <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="100" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="database-2"  port="3123"/>
       </rsc_op>
@@ -569,503 +641,521 @@
         <rsc_op id="36" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="33">
+  <synapse id="41">
     <action_set>
       <rsc_op id="36" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="database-2"  port="3123"/>
+        <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="database-2"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="34" priority="1000000">
+  <synapse id="42" priority="1000000">
     <action_set>
-      <rsc_op id="251" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
+      <rsc_op id="257" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="175" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="35">
+  <synapse id="43">
     <action_set>
-      <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
+      <rsc_op id="256" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="173" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="36" priority="1000000">
+  <synapse id="44" priority="1000000">
     <action_set>
-      <rsc_op id="242" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
+      <rsc_op id="248" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
+        <pseudo_event id="163" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="37">
+  <synapse id="45">
     <action_set>
-      <rsc_op id="241" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
+      <rsc_op id="247" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
+        <pseudo_event id="161" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="38">
+  <synapse id="46">
     <action_set>
-      <rsc_op id="147" operation="monitor" operation_key="redis_monitor_20000" internal_operation_key="redis:0_monitor_20000" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
+      <rsc_op id="153" operation="monitor" operation_key="redis_monitor_20000" internal_operation_key="redis:0_monitor_20000" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="20000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_op_target_rc="8" CRM_meta_physical_host="controller-0" CRM_meta_role="Master" CRM_meta_timeout="60000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="146" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
+        <rsc_op id="152" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="164" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
+        <pseudo_event id="176" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="39">
+  <synapse id="47">
     <action_set>
-      <rsc_op id="146" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
+      <rsc_op id="152" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="165" operation="promote" operation_key="redis-bundle-master_promote_0"/>
+        <pseudo_event id="171" operation="promote" operation_key="redis-bundle-master_promote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="40" priority="1000000">
+  <synapse id="48" priority="1000000">
     <action_set>
-      <rsc_op id="253" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
+      <rsc_op id="259" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="175" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="41">
+  <synapse id="49">
     <action_set>
-      <rsc_op id="252" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
+      <rsc_op id="258" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="173" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="42" priority="1000000">
+  <synapse id="50" priority="1000000">
     <action_set>
-      <rsc_op id="243" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
+      <rsc_op id="249" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
+        <pseudo_event id="163" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="43">
+  <synapse id="51">
     <action_set>
-      <rsc_op id="152" operation="monitor" operation_key="redis:1_monitor_60000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
+      <rsc_op id="158" operation="monitor" operation_key="redis:1_monitor_60000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="60000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_role="Slave" CRM_meta_timeout="60000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="139" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
+        <rsc_op id="156" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="164" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
+        <pseudo_event id="176" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44">
+  <synapse id="52">
     <action_set>
-      <rsc_op id="151" operation="monitor" operation_key="redis:1_monitor_45000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
+      <rsc_op id="157" operation="monitor" operation_key="redis:1_monitor_45000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="45000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="60000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="139" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
+        <rsc_op id="156" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="164" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
+        <pseudo_event id="176" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="53">
     <action_set>
-      <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
+      <rsc_op id="156" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="137" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="139" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="153" operation="start" operation_key="redis-bundle-master_start_0"/>
+        <pseudo_event id="159" operation="start" operation_key="redis-bundle-master_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="46" priority="1000000">
+  <synapse id="54" priority="1000000">
     <action_set>
-      <rsc_op id="255" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
+      <rsc_op id="261" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="175" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="47">
+  <synapse id="55">
     <action_set>
-      <rsc_op id="254" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
+      <rsc_op id="260" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="173" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="48" priority="1000000">
+  <synapse id="56" priority="1000000">
     <action_set>
-      <rsc_op id="245" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
+      <rsc_op id="251" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
+        <pseudo_event id="163" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="49">
+  <synapse id="57">
     <action_set>
-      <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
+      <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
+        <pseudo_event id="161" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="50" priority="1000000">
+  <synapse id="58" priority="1000000">
     <action_set>
-      <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0">
+      <pseudo_event id="176" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="175" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="251" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
+        <rsc_op id="257" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="253" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
+        <rsc_op id="259" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="255" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
+        <rsc_op id="261" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="51" priority="1000000">
+  <synapse id="59" priority="1000000">
     <action_set>
-      <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0">
+      <pseudo_event id="175" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="166" operation="promoted" operation_key="redis-bundle-master_promoted_0"/>
+        <pseudo_event id="172" operation="promoted" operation_key="redis-bundle-master_promoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0"/>
+        <pseudo_event id="174" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="52">
+  <synapse id="60">
     <action_set>
-      <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0">
+      <pseudo_event id="174" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="173" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
+        <rsc_op id="256" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="252" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
+        <rsc_op id="258" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="254" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
+        <rsc_op id="260" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="53">
+  <synapse id="61">
     <action_set>
-      <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0">
+      <pseudo_event id="173" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="164" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="54" priority="1000000">
+  <synapse id="62" priority="1000000">
     <action_set>
-      <pseudo_event id="166" operation="promoted" operation_key="redis-bundle-master_promoted_0">
+      <pseudo_event id="172" operation="promoted" operation_key="redis-bundle-master_promoted_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="146" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
+        <rsc_op id="152" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="55">
+  <synapse id="63">
     <action_set>
-      <pseudo_event id="165" operation="promote" operation_key="redis-bundle-master_promote_0">
+      <pseudo_event id="171" operation="promote" operation_key="redis-bundle-master_promote_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="154" operation="running" operation_key="redis-bundle-master_running_0"/>
+        <pseudo_event id="160" operation="running" operation_key="redis-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0"/>
+        <pseudo_event id="174" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="177" operation="promote" operation_key="redis-bundle_promote_0"/>
+        <pseudo_event id="183" operation="promote" operation_key="redis-bundle_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="56" priority="1000000">
+  <synapse id="64" priority="1000000">
     <action_set>
-      <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0">
+      <pseudo_event id="164" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
+        <pseudo_event id="163" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="242" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
+        <rsc_op id="248" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="243" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
+        <rsc_op id="249" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="245" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
+        <rsc_op id="251" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="57" priority="1000000">
+  <synapse id="65" priority="1000000">
     <action_set>
-      <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0">
+      <pseudo_event id="163" operation="notify" operation_key="redis-bundle-master_post_notify_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="154" operation="running" operation_key="redis-bundle-master_running_0"/>
+        <pseudo_event id="160" operation="running" operation_key="redis-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="162" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="58">
+  <synapse id="66">
     <action_set>
-      <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0">
+      <pseudo_event id="162" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
+        <pseudo_event id="161" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="241" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
+        <rsc_op id="247" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
+        <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="59">
+  <synapse id="67">
     <action_set>
-      <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0">
+      <pseudo_event id="161" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="60" priority="1000000">
+  <synapse id="68" priority="1000000">
     <action_set>
-      <pseudo_event id="154" operation="running" operation_key="redis-bundle-master_running_0">
+      <pseudo_event id="160" operation="running" operation_key="redis-bundle-master_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
+        <rsc_op id="156" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="153" operation="start" operation_key="redis-bundle-master_start_0"/>
+        <pseudo_event id="159" operation="start" operation_key="redis-bundle-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="61">
+  <synapse id="69">
     <action_set>
-      <pseudo_event id="153" operation="start" operation_key="redis-bundle-master_start_0">
+      <pseudo_event id="159" operation="start" operation_key="redis-bundle-master_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="140" operation="start" operation_key="redis-bundle_start_0"/>
+        <pseudo_event id="146" operation="start" operation_key="redis-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="162" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="62">
+  <synapse id="70">
+    <action_set>
+      <rsc_op id="136" operation="monitor" operation_key="redis-bundle-0_monitor_30000" on_node="controller-0" on_node_uuid="1">
+        <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="30000" addr="controller-0"  port="3124"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="71">
     <action_set>
-      <rsc_op id="133" operation="monitor" operation_key="redis-bundle-docker-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="3" operation="cancel" operation_key="redis-bundle-0_monitor_60000" on_node="controller-0" on_node_uuid="1">
+        <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_call_id="17" CRM_meta_container="redis-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_operation="monitor" CRM_meta_timeout="30000" addr="controller-0"  port="3124"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="72">
+    <action_set>
+      <rsc_op id="138" operation="monitor" operation_key="redis-bundle-docker-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/redis:/var/lib/redis:rw -v /var/log/redis:/var/log/redis:rw -v /var/run/redis:/var/run/redis:rw -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/redis-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="137" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="63">
+  <synapse id="73">
     <action_set>
-      <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="137" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/redis:/var/lib/redis:rw -v /var/log/redis:/var/log/redis:rw -v /var/run/redis:/var/run/redis:rw -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/redis-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="140" operation="start" operation_key="redis-bundle_start_0"/>
+        <pseudo_event id="146" operation="start" operation_key="redis-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="64">
+  <synapse id="74">
     <action_set>
-      <rsc_op id="135" operation="monitor" operation_key="redis-bundle-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="140" operation="monitor" operation_key="redis-bundle-1_monitor_30000" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="controller-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" addr="controller-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="139" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="65">
+  <synapse id="75">
     <action_set>
-      <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="139" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="controller-1"  port="3124"/>
       </rsc_op>
@@ -1075,273 +1165,291 @@
         <rsc_op id="37" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="137" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="66">
+  <synapse id="76">
     <action_set>
       <rsc_op id="37" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-1"  port="3124"/>
+        <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" addr="controller-1"  port="3124"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="137" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="67">
+  <synapse id="77">
     <action_set>
-      <rsc_op id="182" operation="monitor" operation_key="ip-192.168.24.11_monitor_10000" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="145" operation="monitor" operation_key="redis-bundle-2_monitor_30000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_container="redis-bundle-docker-2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="30000" addr="controller-2"  port="3124"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="78">
+    <action_set>
+      <rsc_op id="7" operation="cancel" operation_key="redis-bundle-2_monitor_60000" on_node="controller-2" on_node_uuid="3">
+        <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_call_id="17" CRM_meta_container="redis-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_operation="monitor" CRM_meta_timeout="30000" addr="controller-2"  port="3124"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="79">
+    <action_set>
+      <rsc_op id="188" operation="monitor" operation_key="ip-192.168.24.11_monitor_10000" on_node="controller-0" on_node_uuid="1">
         <primitive id="ip-192.168.24.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.24.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="181" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="187" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="68">
+  <synapse id="80">
     <action_set>
-      <rsc_op id="181" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="187" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="ip-192.168.24.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.24.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="69">
+  <synapse id="81">
     <action_set>
-      <rsc_op id="184" operation="monitor" operation_key="ip-10.0.0.104_monitor_10000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="190" operation="monitor" operation_key="ip-10.0.0.104_monitor_10000" on_node="controller-1" on_node_uuid="2">
         <primitive id="ip-10.0.0.104" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32"  ip="10.0.0.104"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="183" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="189" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="70">
+  <synapse id="82">
     <action_set>
-      <rsc_op id="183" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="189" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="ip-10.0.0.104" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32"  ip="10.0.0.104"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="71">
+  <synapse id="83">
     <action_set>
-      <rsc_op id="188" operation="monitor" operation_key="ip-172.17.1.11_monitor_10000" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="194" operation="monitor" operation_key="ip-172.17.1.11_monitor_10000" on_node="controller-0" on_node_uuid="1">
         <primitive id="ip-172.17.1.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="187" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="193" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="72">
+  <synapse id="84">
     <action_set>
-      <rsc_op id="187" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="193" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="ip-172.17.1.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="73">
+  <synapse id="85">
     <action_set>
-      <rsc_op id="190" operation="monitor" operation_key="ip-172.17.3.13_monitor_10000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="196" operation="monitor" operation_key="ip-172.17.3.13_monitor_10000" on_node="controller-1" on_node_uuid="2">
         <primitive id="ip-172.17.3.13" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.3.13"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="189" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="195" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="74">
+  <synapse id="86">
     <action_set>
-      <rsc_op id="189" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="195" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="ip-172.17.3.13" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.3.13"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="75">
+  <synapse id="87">
     <action_set>
-      <rsc_op id="196" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="202" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="195" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="201" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="76">
+  <synapse id="88">
     <action_set>
-      <rsc_op id="195" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="201" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="199" operation="start" operation_key="haproxy-bundle_start_0"/>
+        <pseudo_event id="205" operation="start" operation_key="haproxy-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="77">
+  <synapse id="89">
     <action_set>
-      <rsc_op id="204" operation="monitor" operation_key="openstack-cinder-volume_monitor_60000" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="210" operation="monitor" operation_key="openstack-cinder-volume_monitor_60000" on_node="controller-0" on_node_uuid="1">
         <primitive id="openstack-cinder-volume" class="systemd" type="openstack-cinder-volume"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="203" operation="start" operation_key="openstack-cinder-volume_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="209" operation="start" operation_key="openstack-cinder-volume_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="78">
+  <synapse id="90">
     <action_set>
-      <rsc_op id="203" operation="start" operation_key="openstack-cinder-volume_start_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="209" operation="start" operation_key="openstack-cinder-volume_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="openstack-cinder-volume" class="systemd" type="openstack-cinder-volume"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="200000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="79">
+  <synapse id="91">
     <action_set>
-      <rsc_op id="210" operation="monitor" operation_key="stonith-fence_ipmilan-525400c709f7_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="216" operation="monitor" operation_key="stonith-fence_ipmilan-525400c709f7_monitor_60000" on_node="controller-1" on_node_uuid="2">
         <primitive id="stonith-fence_ipmilan-525400c709f7" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6240" lanplus="true" login="admin" passwd="password" pcmk_host_list="messaging-0" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="209" operation="start" operation_key="stonith-fence_ipmilan-525400c709f7_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="215" operation="start" operation_key="stonith-fence_ipmilan-525400c709f7_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="80">
+  <synapse id="92">
     <action_set>
-      <rsc_op id="209" operation="start" operation_key="stonith-fence_ipmilan-525400c709f7_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="215" operation="start" operation_key="stonith-fence_ipmilan-525400c709f7_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="stonith-fence_ipmilan-525400c709f7" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6240" lanplus="true" login="admin" passwd="password" pcmk_host_list="messaging-0" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="81">
+  <synapse id="93">
     <action_set>
-      <rsc_op id="216" operation="monitor" operation_key="stonith-fence_ipmilan-5254005ea387_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="222" operation="monitor" operation_key="stonith-fence_ipmilan-5254005ea387_monitor_60000" on_node="controller-1" on_node_uuid="2">
         <primitive id="stonith-fence_ipmilan-5254005ea387" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6235" lanplus="true" login="admin" passwd="password" pcmk_host_list="database-0" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="215" operation="start" operation_key="stonith-fence_ipmilan-5254005ea387_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="221" operation="start" operation_key="stonith-fence_ipmilan-5254005ea387_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="82">
+  <synapse id="94">
     <action_set>
-      <rsc_op id="215" operation="start" operation_key="stonith-fence_ipmilan-5254005ea387_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="221" operation="start" operation_key="stonith-fence_ipmilan-5254005ea387_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="stonith-fence_ipmilan-5254005ea387" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6235" lanplus="true" login="admin" passwd="password" pcmk_host_list="database-0" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="83">
+  <synapse id="95">
     <action_set>
-      <rsc_op id="218" operation="monitor" operation_key="stonith-fence_ipmilan-525400542c06_monitor_60000" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="224" operation="monitor" operation_key="stonith-fence_ipmilan-525400542c06_monitor_60000" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400542c06" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6236" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-2" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="217" operation="start" operation_key="stonith-fence_ipmilan-525400542c06_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="223" operation="start" operation_key="stonith-fence_ipmilan-525400542c06_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="84">
+  <synapse id="96">
     <action_set>
-      <rsc_op id="217" operation="start" operation_key="stonith-fence_ipmilan-525400542c06_start_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="223" operation="start" operation_key="stonith-fence_ipmilan-525400542c06_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400542c06" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6236" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-2" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="85">
+  <synapse id="97">
     <action_set>
-      <rsc_op id="222" operation="monitor" operation_key="stonith-fence_ipmilan-525400498d34_monitor_60000" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="228" operation="monitor" operation_key="stonith-fence_ipmilan-525400498d34_monitor_60000" on_node="controller-1" on_node_uuid="2">
         <primitive id="stonith-fence_ipmilan-525400498d34" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6231" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-0" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="221" operation="start" operation_key="stonith-fence_ipmilan-525400498d34_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="227" operation="start" operation_key="stonith-fence_ipmilan-525400498d34_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="86">
+  <synapse id="98">
     <action_set>
-      <rsc_op id="221" operation="start" operation_key="stonith-fence_ipmilan-525400498d34_start_0" on_node="controller-1" on_node_uuid="2">
+      <rsc_op id="227" operation="start" operation_key="stonith-fence_ipmilan-525400498d34_start_0" on_node="controller-1" on_node_uuid="2">
         <primitive id="stonith-fence_ipmilan-525400498d34" class="stonith" type="fence_ipmilan"/>
         <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.8" ipport="6231" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-0" privlvl="administrator"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="87">
+  <synapse id="99">
     <action_set>
-      <pseudo_event id="225" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2">
+      <pseudo_event id="231" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2">
         <attributes CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="galera-bundle-2"/>
@@ -1350,13 +1458,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="97" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="88">
+  <synapse id="100">
     <action_set>
-      <pseudo_event id="224" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0">
+      <pseudo_event id="230" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0">
         <attributes CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="galera-bundle-0"/>
@@ -1365,222 +1473,222 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="87" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="89">
+  <synapse id="101">
     <action_set>
-      <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="224" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
+        <pseudo_event id="230" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="225" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2"/>
+        <pseudo_event id="231" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="90" priority="1000000">
+  <synapse id="102" priority="1000000">
     <action_set>
-      <pseudo_event id="200" operation="running" operation_key="haproxy-bundle_running_0">
+      <pseudo_event id="206" operation="running" operation_key="haproxy-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="195" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="201" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="91">
+  <synapse id="103">
     <action_set>
-      <pseudo_event id="199" operation="start" operation_key="haproxy-bundle_start_0">
+      <pseudo_event id="205" operation="start" operation_key="haproxy-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="181" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="187" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="183" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="189" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="187" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="193" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="189" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="195" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="92" priority="1000000">
+  <synapse id="104" priority="1000000">
     <action_set>
-      <pseudo_event id="178" operation="promoted" operation_key="redis-bundle_promoted_0">
+      <pseudo_event id="184" operation="promoted" operation_key="redis-bundle_promoted_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
+        <pseudo_event id="176" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="93">
+  <synapse id="105">
     <action_set>
-      <pseudo_event id="177" operation="promote" operation_key="redis-bundle_promote_0">
+      <pseudo_event id="183" operation="promote" operation_key="redis-bundle_promote_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="141" operation="running" operation_key="redis-bundle_running_0"/>
+        <pseudo_event id="147" operation="running" operation_key="redis-bundle_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="94" priority="1000000">
+  <synapse id="106" priority="1000000">
     <action_set>
-      <pseudo_event id="141" operation="running" operation_key="redis-bundle_running_0">
+      <pseudo_event id="147" operation="running" operation_key="redis-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
+        <rsc_op id="137" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="164" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="95">
+  <synapse id="107">
     <action_set>
-      <pseudo_event id="140" operation="start" operation_key="redis-bundle_start_0">
+      <pseudo_event id="146" operation="start" operation_key="redis-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="96" priority="1000000">
+  <synapse id="108" priority="1000000">
     <action_set>
-      <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0">
+      <pseudo_event id="131" operation="demoted" operation_key="galera-bundle_demoted_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="126" operation="demote" operation_key="galera-bundle_demote_0"/>
+        <pseudo_event id="130" operation="demote" operation_key="galera-bundle_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="97">
+  <synapse id="109">
     <action_set>
-      <pseudo_event id="126" operation="demote" operation_key="galera-bundle_demote_0">
+      <pseudo_event id="130" operation="demote" operation_key="galera-bundle_demote_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="98" priority="1000000">
+  <synapse id="110" priority="1000000">
     <action_set>
-      <pseudo_event id="125" operation="promoted" operation_key="galera-bundle_promoted_0">
+      <pseudo_event id="129" operation="promoted" operation_key="galera-bundle_promoted_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="121" operation="promoted" operation_key="galera-bundle-master_promoted_0"/>
+        <pseudo_event id="125" operation="promoted" operation_key="galera-bundle-master_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="99">
+  <synapse id="111">
     <action_set>
-      <pseudo_event id="124" operation="promote" operation_key="galera-bundle_promote_0">
+      <pseudo_event id="128" operation="promote" operation_key="galera-bundle_promote_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="99" operation="running" operation_key="galera-bundle_running_0"/>
+        <pseudo_event id="103" operation="running" operation_key="galera-bundle_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="101" operation="stopped" operation_key="galera-bundle_stopped_0"/>
+        <pseudo_event id="105" operation="stopped" operation_key="galera-bundle_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0"/>
+        <pseudo_event id="131" operation="demoted" operation_key="galera-bundle_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="100" priority="1000000">
+  <synapse id="112" priority="1000000">
     <action_set>
-      <pseudo_event id="101" operation="stopped" operation_key="galera-bundle_stopped_0">
+      <pseudo_event id="105" operation="stopped" operation_key="galera-bundle_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="87" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="97" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
+        <pseudo_event id="123" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="101">
+  <synapse id="113">
     <action_set>
-      <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0">
+      <pseudo_event id="104" operation="stop" operation_key="galera-bundle_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0"/>
+        <pseudo_event id="131" operation="demoted" operation_key="galera-bundle_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="102" priority="1000000">
+  <synapse id="114" priority="1000000">
     <action_set>
-      <pseudo_event id="99" operation="running" operation_key="galera-bundle_running_0">
+      <pseudo_event id="103" operation="running" operation_key="galera-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="88" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="98" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="117" operation="running" operation_key="galera-bundle-master_running_0"/>
+        <pseudo_event id="121" operation="running" operation_key="galera-bundle-master_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="103">
+  <synapse id="115">
     <action_set>
-      <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0">
+      <pseudo_event id="102" operation="start" operation_key="galera-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="101" operation="stopped" operation_key="galera-bundle_stopped_0"/>
+        <pseudo_event id="105" operation="stopped" operation_key="galera-bundle_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0"/>
+        <pseudo_event id="131" operation="demoted" operation_key="galera-bundle_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="104">
+  <synapse id="116">
     <action_set>
       <pseudo_event id="34" operation="all_stopped" operation_key="all_stopped">
         <attributes />
@@ -1588,19 +1696,19 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="87" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
+        <rsc_op id="97" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
+        <pseudo_event id="111" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
+        <pseudo_event id="116" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="229" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
Index: pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-on-remote.summary
===================================================================
--- pacemaker-1.1.18+20171218.8a704193c.orig/pengine/test10/bundle-order-stop-on-remote.summary
+++ pacemaker-1.1.18+20171218.8a704193c/pengine/test10/bundle-order-stop-on-remote.summary
@@ -74,7 +74,19 @@ Transition Summary:
 Executing cluster transition:
  * Resource action: database-0      start on controller-0
  * Resource action: database-2      start on controller-1
+ * Resource action: rabbitmq-bundle-0 monitor=30000 on controller-2
+ * Resource action: rabbitmq-bundle-0 cancel=60000 on controller-2
+ * Resource action: rabbitmq-bundle-1 monitor=30000 on controller-2
+ * Resource action: rabbitmq-bundle-1 cancel=60000 on controller-2
+ * Resource action: rabbitmq-bundle-2 monitor=30000 on controller-2
+ * Resource action: rabbitmq-bundle-2 cancel=60000 on controller-2
+ * Resource action: galera-bundle-1 monitor=30000 on controller-2
+ * Resource action: galera-bundle-1 cancel=60000 on controller-2
  * Pseudo action:   redis-bundle-master_pre_notify_start_0
+ * Resource action: redis-bundle-0  monitor=30000 on controller-0
+ * Resource action: redis-bundle-0  cancel=60000 on controller-0
+ * Resource action: redis-bundle-2  monitor=30000 on controller-2
+ * Resource action: redis-bundle-2  cancel=60000 on controller-2
  * Resource action: stonith-fence_ipmilan-525400c709f7 start on controller-1
  * Resource action: stonith-fence_ipmilan-5254005ea387 start on controller-1
  * Resource action: stonith-fence_ipmilan-525400542c06 start on controller-0
@@ -125,7 +137,7 @@ Executing cluster transition:
  * Pseudo action:   galera-bundle-master_stopped_0
  * Resource action: redis           start on redis-bundle-1
  * Pseudo action:   redis-bundle-master_running_0
- * Resource action: redis-bundle-1  monitor=60000 on controller-1
+ * Resource action: redis-bundle-1  monitor=30000 on controller-1
  * Resource action: haproxy-bundle-docker-1 monitor=60000 on controller-1
  * Pseudo action:   galera-bundle_stopped_0
  * Pseudo action:   galera-bundle_start_0
@@ -148,8 +160,8 @@ Executing cluster transition:
  * Resource action: galera          start on galera-bundle-0
  * Resource action: galera          start on galera-bundle-2
  * Pseudo action:   galera-bundle-master_running_0
- * Resource action: galera-bundle-0 monitor=60000 on controller-0
- * Resource action: galera-bundle-2 monitor=60000 on controller-1
+ * Resource action: galera-bundle-0 monitor=30000 on controller-0
+ * Resource action: galera-bundle-2 monitor=30000 on controller-1
  * Pseudo action:   redis-bundle-master_pre_notify_promote_0
  * Pseudo action:   redis-bundle_promote_0
  * Pseudo action:   galera-bundle_running_0