Blob Blame History Raw
From 15208f73303d5c9ecfedef55a77b8d04c442a80a Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Wed, 1 Nov 2017 22:27:38 +1100
Subject: [PATCH 1/4] Fix: PE: Correctly defer processing of resources inside
 containers

---
 lib/pengine/unpack.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
index 6c54647..873d895 100644
--- a/lib/pengine/unpack.c
+++ b/lib/pengine/unpack.c
@@ -1097,9 +1097,32 @@ unpack_node_loop(xmlNode * status, bool fence, pe_working_set_t * data_set)
             process = TRUE;
 
         } else if (is_remote_node(this_node)) {
+            bool check = FALSE;
             resource_t *rsc = this_node->details->remote_rsc;
 
-            if (fence || (rsc && rsc->role == RSC_ROLE_STARTED)) {
+            if(fence) {
+                check = TRUE;
+
+            } else if(rsc == NULL) {
+                /* Not ready yet */
+
+            } else if (is_container_remote_node(this_node)
+                       && rsc->role == RSC_ROLE_STARTED
+                       && rsc->container->role == RSC_ROLE_STARTED) {
+                /* Both the connection and the underlying container
+                 * need to be known 'up' before we volunterily process
+                 * resources inside it
+                 */
+                check = TRUE;
+                crm_trace("Checking node %s/%s/%s status %d/%d/%d", id, rsc->id, rsc->container->id, fence, rsc->role, RSC_ROLE_STARTED);
+
+            } else if (is_container_remote_node(this_node) == FALSE
+                       && rsc->role == RSC_ROLE_STARTED) {
+                check = TRUE;
+                crm_trace("Checking node %s/%s status %d/%d/%d", id, rsc->id, fence, rsc->role, RSC_ROLE_STARTED);
+            }
+
+            if (check) {
                 determine_remote_online_status(data_set, this_node);
                 unpack_handle_remote_attrs(this_node, state, data_set);
                 process = TRUE;
-- 
1.8.3.1


From 3a34feda66fea579f86aac6b525fddc4b68d00ff Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Thu, 2 Nov 2017 13:36:28 +1100
Subject: [PATCH 2/4] Fix: PE: Allow all resources to stop prior to probes
 completing

- Avoids transition loops, particularly with bundles
- Fix docker/remote probe ordering for bundles
---
 pengine/graph.c  | 48 +++++++++++++++++++++++++-----------------------
 pengine/native.c | 12 ------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/pengine/graph.c b/pengine/graph.c
index e3ee4fc..0906f1a 100644
--- a/pengine/graph.c
+++ b/pengine/graph.c
@@ -184,13 +184,34 @@ rsc_expand_action(action_t * action)
 static enum pe_graph_flags
 graph_update_action(action_t * first, action_t * then, node_t * node,
                     enum pe_action_flags first_flags, enum pe_action_flags then_flags,
-                    enum pe_ordering type)
+                    action_wrapper_t *order)
 {
     enum pe_graph_flags changed = pe_graph_none;
+    enum pe_ordering type = order->type;
     gboolean processed = FALSE;
 
     /* TODO: Do as many of these in parallel as possible */
 
+    if(is_set(type, pe_order_implies_then_on_node)) {
+        /* Normally we want the _whole_ 'then' clone to
+         * restart if 'first' is restarted, so then->node is
+         * needed.
+         *
+         * However for unfencing, we want to limit this to
+         * instances on the same node as 'first' (the
+         * unfencing operation), so first->node is supplied.
+         *
+         * Swap the node, from then on we can can treat it
+         * like any other 'pe_order_implies_then'
+         */
+
+        clear_bit(type, pe_order_implies_then_on_node);
+        set_bit(type, pe_order_implies_then);
+        node = first->node;
+    }
+
+    clear_bit(first_flags, pe_action_pseudo);
+
     if (type & pe_order_implies_then) {
         processed = TRUE;
         if (then->rsc) {
@@ -300,6 +321,8 @@ graph_update_action(action_t * first, action_t * then, node_t * node,
         if (is_not_set(first_flags, pe_action_runnable) && first->rsc->running_on != NULL) {
             pe_rsc_trace(then->rsc, "Ignoring %s then %s - %s is about to be stopped",
                          first->uuid, then->uuid, first->rsc->id);
+            type = pe_order_none;
+            order->type = pe_order_none;
 
         } else {
             pe_rsc_trace(then->rsc, "Enforcing %s then %s", first->uuid, then->uuid);
@@ -608,29 +631,8 @@ update_action(action_t * then)
              *   constraint to instances on the supplied node
              *
              */
-            int otype = other->type;
             node_t *node = then->node;
-
-            if(is_set(otype, pe_order_implies_then_on_node)) {
-                /* Normally we want the _whole_ 'then' clone to
-                 * restart if 'first' is restarted, so then->node is
-                 * needed.
-                 *
-                 * However for unfencing, we want to limit this to
-                 * instances on the same node as 'first' (the
-                 * unfencing operation), so first->node is supplied.
-                 *
-                 * Swap the node, from then on we can can treat it
-                 * like any other 'pe_order_implies_then'
-                 */
-
-                clear_bit(otype, pe_order_implies_then_on_node);
-                set_bit(otype, pe_order_implies_then);
-                node = first->node;
-            }
-            clear_bit(first_flags, pe_action_pseudo);
-
-            changed |= graph_update_action(first, then, node, first_flags, then_flags, otype);
+            changed |= graph_update_action(first, then, node, first_flags, then_flags, other);
 
             /* 'first' was for a complex resource (clone, group, etc),
              * create a new dependency if necessary
diff --git a/pengine/native.c b/pengine/native.c
index 5ba7b5f..a8ae655 100644
--- a/pengine/native.c
+++ b/pengine/native.c
@@ -3008,18 +3008,6 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
                         top, reload_key(rsc), NULL,
                         pe_order_optional, data_set);
 
-    if(node->details->shutdown == FALSE
-       && is_not_set(rsc->flags, pe_rsc_failed)
-       && rsc->next_role != RSC_ROLE_STOPPED) {
-        /* Avoid trying to move resources before we know the location
-         * elsewhere, but stopping should always be allowed.
-         * Especially if the resource has failed.
-         */
-        custom_action_order(rsc, NULL, probe,
-                            rsc, generate_op_key(rsc->id, RSC_STOP, 0), NULL,
-                            pe_order_optional, data_set);
-    }
-
     if(is_set(rsc->flags, pe_rsc_fence_device) && is_set(data_set->flags, pe_flag_enable_unfencing)) {
         /* Normally rsc.start depends on probe complete which depends
          * on rsc.probe. But this can't be the case in this scenario as
-- 
1.8.3.1


From 837adaec3d26db2c94b312e2ca32830dbac33285 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Thu, 2 Nov 2017 13:40:01 +1100
Subject: [PATCH 3/4] Log: PE: Improved logging of reasons for stop/restart
 actions

---
 lib/pengine/utils.c | 28 +++++++++++++++++++++-------
 pengine/allocate.c  | 11 +++++++++--
 pengine/native.c    | 13 +++++++++----
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 272fa16..baebc17 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -547,7 +547,7 @@ custom_action(resource_t * rsc, char *key, const char *task,
 
         } else if (action->node == NULL) {
             pe_rsc_trace(rsc, "Unset runnable on %s", action->uuid);
-            pe_action_set_flag_reason(__FUNCTION__, __LINE__, action, NULL, "node availability", pe_action_runnable, TRUE);
+            pe_clear_action_bit(action, pe_action_runnable);
 
         } else if (is_not_set(rsc->flags, pe_rsc_managed)
                    && g_hash_table_lookup(action->meta, XML_LRM_ATTR_INTERVAL) == NULL) {
@@ -574,7 +574,7 @@ custom_action(resource_t * rsc, char *key, const char *task,
 
         } else if (action->needs == rsc_req_nothing) {
             pe_rsc_trace(rsc, "Action %s does not require anything", action->uuid);
-            free(action->reason); action->reason = NULL;
+            pe_action_set_reason(action, NULL, TRUE);
             pe_set_action_bit(action, pe_action_runnable);
 #if 0
             /*
@@ -599,9 +599,9 @@ custom_action(resource_t * rsc, char *key, const char *task,
                              action->node->details->uname, action->uuid);
             }
 
-        } else {
+        } else if(is_not_set(action->flags, pe_action_runnable)) {
             pe_rsc_trace(rsc, "Action %s is runnable", action->uuid);
-            free(action->reason); action->reason = NULL;
+            //pe_action_set_reason(action, NULL, TRUE);
             pe_set_action_bit(action, pe_action_runnable);
         }
 
@@ -1953,14 +1953,16 @@ rsc_action_digest_cmp(resource_t * rsc, xmlNode * xml_op, node_t * node,
     char *key = NULL;
     int interval = 0;
 
-    const char *interval_s = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
+    const char *op_version;
     const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
+    const char *interval_s = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
 
     const char *digest_all;
     const char *digest_restart;
 
     CRM_ASSERT(node != NULL);
 
+    op_version = crm_element_value(xml_op, XML_ATTR_CRM_VERSION);
     digest_all = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
     digest_restart = crm_element_value(xml_op, XML_LRM_ATTR_RESTART_DIGEST);
 
@@ -1970,6 +1972,10 @@ rsc_action_digest_cmp(resource_t * rsc, xmlNode * xml_op, node_t * node,
 
     data->rc = RSC_DIGEST_MATCH;
     if (digest_restart && data->digest_restart_calc && strcmp(data->digest_restart_calc, digest_restart) != 0) {
+        pe_rsc_info(rsc, "Parameters to %s on %s changed: was %s vs. now %s (restart:%s) %s",
+                 key, node->details->uname,
+                 crm_str(digest_restart), data->digest_restart_calc,
+                 op_version, crm_element_value(xml_op, XML_ATTR_TRANSITION_MAGIC));
         data->rc = RSC_DIGEST_RESTART;
 
     } else if (digest_all == NULL) {
@@ -1977,6 +1983,10 @@ rsc_action_digest_cmp(resource_t * rsc, xmlNode * xml_op, node_t * node,
         data->rc = RSC_DIGEST_UNKNOWN;
 
     } else if (strcmp(digest_all, data->digest_all_calc) != 0) {
+        pe_rsc_info(rsc, "Parameters to %s on %s changed: was %s vs. now %s (reload:%s) %s",
+                 key, node->details->uname,
+                 crm_str(digest_all), data->digest_all_calc,
+                 op_version, crm_element_value(xml_op, XML_ATTR_TRANSITION_MAGIC));
         data->rc = RSC_DIGEST_ALL;
     }
 
@@ -2306,10 +2316,14 @@ void pe_action_set_flag_reason(const char *function, long line,
 
 void pe_action_set_reason(pe_action_t *action, const char *reason, bool overwrite) 
 {
-    if(action->reason == NULL || overwrite) {
+    if(action->reason && overwrite) {
+        pe_rsc_trace(action->rsc, "Changing %s reason from '%s' to '%s'", action->uuid, action->reason, reason);
         free(action->reason);
+        action->reason = NULL;
+    }
+    if(action->reason == NULL) {
         if(reason) {
-            crm_trace("Set %s reason to '%s'", action->uuid, reason);
+            pe_rsc_trace(action->rsc, "Set %s reason to '%s'", action->uuid, reason);
             action->reason = strdup(reason);
         } else {
             action->reason = NULL;
diff --git a/pengine/allocate.c b/pengine/allocate.c
index 62b141a..b7a505a 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -320,6 +320,7 @@ check_action_definition(resource_t * rsc, node_t * active_node, xmlNode * xml_op
 
     } else if (digest_data->rc == RSC_DIGEST_RESTART) {
         /* Changes that force a restart */
+        pe_action_t *required = NULL;
         const char *digest_restart = crm_element_value(xml_op, XML_LRM_ATTR_RESTART_DIGEST);
 
         did_change = TRUE;
@@ -330,7 +331,10 @@ check_action_definition(resource_t * rsc, node_t * active_node, xmlNode * xml_op
                  crm_str(digest_restart), digest_data->digest_restart_calc,
                  op_version, crm_element_value(xml_op, XML_ATTR_TRANSITION_MAGIC));
 
-        custom_action(rsc, key, task, NULL, FALSE, TRUE, data_set);
+        required = custom_action(rsc, key, task, NULL, TRUE, TRUE, data_set);
+        pe_action_set_flag_reason(__FUNCTION__, __LINE__, required, NULL,
+                                  "resource definition change", pe_action_optional, TRUE);
+
         trigger_unfencing(rsc, active_node, "Device parameters changed", NULL, data_set);
 
     } else if ((digest_data->rc == RSC_DIGEST_ALL) || (digest_data->rc == RSC_DIGEST_UNKNOWN)) {
@@ -367,12 +371,15 @@ check_action_definition(resource_t * rsc, node_t * active_node, xmlNode * xml_op
             free(key);
 
         } else {
+            pe_action_t *required = NULL;
             pe_rsc_trace(rsc, "Resource %s doesn't know how to reload", rsc->id);
 
             /* Re-send the start/demote/promote op
              * Recurring ops will be detected independently
              */
-            custom_action(rsc, key, task, NULL, FALSE, TRUE, data_set);
+            required = custom_action(rsc, key, task, NULL, TRUE, TRUE, data_set);
+            pe_action_set_flag_reason(__FUNCTION__, __LINE__, required, NULL,
+                                      "resource definition change", pe_action_optional, TRUE);
         }
     }
 
diff --git a/pengine/native.c b/pengine/native.c
index a8ae655..26a4a7e 100644
--- a/pengine/native.c
+++ b/pengine/native.c
@@ -2392,7 +2392,7 @@ LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal)
                         next->details->uname);
 
         } else if (start && is_set(start->flags, pe_action_runnable) == FALSE) {
-            LogAction("Stop", rsc, current, NULL, stop, start, terminal);
+            LogAction("Stop", rsc, current, NULL, stop, stop->reason?stop:start, terminal);
             STOP_SANITY_ASSERT(__LINE__);
 
         } else if (moving && current) {
@@ -2433,7 +2433,7 @@ LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal)
                 STOP_SANITY_ASSERT(__LINE__);
             }
 
-            LogAction("Stop", rsc, node, NULL, stop_op, start, terminal);
+            LogAction("Stop", rsc, node, NULL, stop_op, stop_op->reason?stop_op:start, terminal);
         }
 
         free(key);
@@ -2493,6 +2493,10 @@ StopRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t * d
         pe_rsc_trace(rsc, "%s on %s", rsc->id, current->details->uname);
         stop = stop_action(rsc, current, optional);
 
+        if(rsc->allocated_to == NULL) {
+            pe_action_set_reason(stop, "node availability", TRUE);
+        }
+
         if (is_not_set(rsc->flags, pe_rsc_managed)) {
             update_action_flags(stop, pe_action_runnable | pe_action_clear, __FUNCTION__, __LINE__);
         }
@@ -2521,7 +2525,7 @@ StartRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t *
     action_t *start = NULL;
 
     CRM_ASSERT(rsc);
-    pe_rsc_trace(rsc, "%s on %s %d", rsc->id, next ? next->details->uname : "N/A", optional);
+    pe_rsc_trace(rsc, "%s on %s %d %d", rsc->id, next ? next->details->uname : "N/A", optional, next ? next->weight : 0);
     start = start_action(rsc, next, TRUE);
 
     if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
@@ -3310,9 +3314,10 @@ ReloadRsc(resource_t * rsc, node_t *node, pe_working_set_t * data_set)
 
     pe_rsc_trace(rsc, "Processing %s", rsc->id);
     set_bit(rsc->flags, pe_rsc_reload);
-    
+
     reload = custom_action(
         rsc, reload_key(rsc), CRMD_ACTION_RELOAD, node, FALSE, TRUE, data_set);
+    pe_action_set_reason(reload, "resource definition change", FALSE);
 
     /* stop = stop_action(rsc, node, optional); */
     other = get_first_named_action(rsc, RSC_STOP, TRUE, node);
-- 
1.8.3.1


From 1fa28f088e04a58f5241461230e50357f281cab0 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Thu, 2 Nov 2017 13:40:26 +1100
Subject: [PATCH 4/4] Test: PE: Improved logging of reasons for stop/restart
 actions

---
 .../11-a-then-bm-b-move-a-clone-starting.dot       |  1 -
 .../11-a-then-bm-b-move-a-clone-starting.exp       |  3 -
 pengine/test10/594.dot                             |  2 -
 pengine/test10/594.exp                             | 12 +--
 pengine/test10/594.summary                         |  4 +-
 pengine/test10/662.dot                             |  3 -
 pengine/test10/662.exp                             | 12 +--
 pengine/test10/662.summary                         |  4 +-
 pengine/test10/696.dot                             |  2 -
 pengine/test10/696.exp                             |  9 +-
 pengine/test10/696.summary                         |  8 +-
 pengine/test10/726.dot                             |  3 -
 pengine/test10/726.exp                             | 12 +--
 pengine/test10/726.summary                         |  8 +-
 pengine/test10/764.dot                             |  5 --
 pengine/test10/764.exp                             | 30 ++-----
 pengine/test10/764.summary                         | 10 +--
 pengine/test10/797.dot                             |  7 --
 pengine/test10/797.exp                             | 36 ++------
 pengine/test10/797.summary                         |  8 +-
 .../8-am-then-bm-a-migrating-b-stopping.summary    |  2 +-
 pengine/test10/829.dot                             |  3 -
 pengine/test10/829.exp                             |  9 --
 pengine/test10/bug-1572-1.summary                  |  2 +-
 pengine/test10/bug-5025-3.summary                  |  2 +-
 pengine/test10/bug-5028.summary                    |  2 +-
 pengine/test10/bug-cl-5219.summary                 |  2 +-
 pengine/test10/bug-cl-5247.summary                 |  6 +-
 pengine/test10/bug-lf-2106.summary                 |  4 +-
 pengine/test10/bug-lf-2435.summary                 |  2 +-
 pengine/test10/bug-lf-2551.summary                 | 32 ++++----
 pengine/test10/bug-lf-2606.summary                 |  2 +-
 pengine/test10/bug-n-387749.dot                    |  2 -
 pengine/test10/bug-n-387749.exp                    |  6 --
 pengine/test10/bug-n-387749.summary                |  8 +-
 pengine/test10/bug-pm-12.summary                   |  4 +-
 pengine/test10/bug-rh-1097457.dot                  |  4 -
 pengine/test10/bug-rh-1097457.exp                  | 12 ---
 pengine/test10/bundle-nested-colocation.exp        | 18 ++--
 pengine/test10/bundle-nested-colocation.summary    |  6 +-
 pengine/test10/bundle-nested-colocation.xml        | 26 +++---
 pengine/test10/bundle-order-fencing.dot            |  6 --
 pengine/test10/bundle-order-fencing.exp            | 26 +-----
 pengine/test10/bundle-order-fencing.xml            | 34 ++++----
 pengine/test10/bundle-order-partial-start-2.exp    | 12 +--
 pengine/test10/bundle-order-partial-start-2.xml    | 18 ++--
 pengine/test10/bundle-order-partial-start.exp      | 12 +--
 pengine/test10/bundle-order-partial-start.xml      | 14 ++--
 pengine/test10/bundle-order-partial-stop.exp       | 10 +--
 pengine/test10/bundle-order-partial-stop.xml       |  4 +-
 pengine/test10/bundle-order-startup-clone-2.exp    | 90 ++++++++++----------
 pengine/test10/bundle-order-startup-clone.exp      | 26 +++---
 pengine/test10/bundle-order-startup.exp            | 30 +++----
 pengine/test10/bundle-order-stop-clone.dot         |  2 -
 pengine/test10/bundle-order-stop-clone.exp         |  8 +-
 pengine/test10/bundle-order-stop-clone.xml         | 38 ++++-----
 pengine/test10/bundle-order-stop.exp               | 10 +--
 pengine/test10/bundle-order-stop.xml               |  4 +-
 pengine/test10/bundle-probe-order-1.exp            | 18 ++--
 pengine/test10/bundle-probe-order-2.dot            |  1 -
 pengine/test10/bundle-probe-order-2.exp            | 37 ++++-----
 pengine/test10/bundle-probe-order-2.summary        |  1 -
 pengine/test10/bundle-probe-order-3.dot            |  1 -
 pengine/test10/bundle-probe-order-3.exp            | 43 ++++------
 pengine/test10/bundle-probe-order-3.summary        |  1 -
 pengine/test10/bundle-probe-remotes.exp            | 96 +++++++++++-----------
 pengine/test10/clone-no-shuffle.summary            |  2 +-
 pengine/test10/cloned-group-stop.summary           |  8 +-
 pengine/test10/cloned-group.summary                |  2 +-
 .../colocation_constraint_stops_slave.summary      |  2 +-
 pengine/test10/group5.dot                          |  5 --
 pengine/test10/group5.exp                          | 18 +---
 pengine/test10/group5.summary                      |  2 +-
 pengine/test10/group6.dot                          |  6 --
 pengine/test10/group6.exp                          | 18 ----
 pengine/test10/group6.summary                      |  2 +-
 pengine/test10/group9.dot                          |  3 -
 pengine/test10/group9.exp                          |  9 --
 pengine/test10/group9.summary                      |  4 +-
 pengine/test10/guest-node-host-dies.dot            |  6 --
 pengine/test10/guest-node-host-dies.exp            | 18 ----
 pengine/test10/guest-node-host-dies.summary        |  2 +-
 pengine/test10/inc12.summary                       | 14 ++--
 pengine/test10/inc2.dot                            |  2 -
 pengine/test10/inc2.exp                            |  6 --
 pengine/test10/inc3.dot                            |  4 -
 pengine/test10/inc3.exp                            | 12 ---
 pengine/test10/inc4.dot                            |  4 -
 pengine/test10/inc4.exp                            | 12 ---
 pengine/test10/inc5.dot                            |  4 -
 pengine/test10/inc5.exp                            | 12 ---
 pengine/test10/load-stopped-loop.summary           |  4 +-
 pengine/test10/master-9.summary                    |  2 +-
 pengine/test10/migrate-1.dot                       |  1 -
 pengine/test10/migrate-1.exp                       |  3 -
 pengine/test10/migrate-shutdown.summary            | 12 +--
 pengine/test10/mon-rsc-2.dot                       |  1 -
 pengine/test10/mon-rsc-2.exp                       |  6 +-
 pengine/test10/mon-rsc-2.summary                   |  2 +-
 pengine/test10/mon-rsc-4.dot                       |  1 -
 pengine/test10/mon-rsc-4.exp                       |  6 +-
 pengine/test10/mon-rsc-4.summary                   |  4 +-
 pengine/test10/monitor-onfail-stop.summary         |  2 +-
 pengine/test10/node-maintenance-1.summary          |  2 +-
 pengine/test10/notify-3.dot                        |  1 -
 pengine/test10/notify-3.exp                        |  3 -
 pengine/test10/novell-251689.summary               |  2 +-
 pengine/test10/novell-252693-2.dot                 |  1 -
 pengine/test10/novell-252693-2.exp                 |  3 -
 pengine/test10/novell-252693-3.dot                 |  1 -
 pengine/test10/novell-252693-3.exp                 |  3 -
 pengine/test10/order-serialize-set.summary         |  4 +-
 pengine/test10/order-serialize.summary             |  4 +-
 pengine/test10/order3.dot                          |  4 -
 pengine/test10/order3.exp                          | 15 +---
 pengine/test10/order3.summary                      |  2 +-
 pengine/test10/order5.dot                          |  4 -
 pengine/test10/order5.exp                          | 24 +-----
 pengine/test10/order5.summary                      |  8 +-
 pengine/test10/order6.dot                          |  4 -
 pengine/test10/order6.exp                          | 24 +-----
 pengine/test10/order6.summary                      |  8 +-
 pengine/test10/orphan-1.summary                    |  2 +-
 pengine/test10/orphan-2.summary                    |  2 +-
 pengine/test10/params-1.dot                        |  3 -
 pengine/test10/params-1.exp                        | 12 +--
 pengine/test10/params-1.summary                    |  8 +-
 pengine/test10/params-2.dot                        |  1 -
 pengine/test10/params-2.exp                        |  6 +-
 pengine/test10/params-2.summary                    |  2 +-
 pengine/test10/params-5.dot                        |  3 -
 pengine/test10/params-5.exp                        | 12 +--
 pengine/test10/params-5.summary                    |  8 +-
 pengine/test10/placement-capacity.summary          |  2 +-
 pengine/test10/placement-location.summary          |  2 +-
 pengine/test10/placement-priority.summary          |  2 +-
 pengine/test10/placement-stickiness.summary        |  2 +-
 pengine/test10/probe-2.summary                     |  2 +-
 pengine/test10/quorum-1.dot                        |  1 -
 pengine/test10/quorum-1.exp                        |  6 +-
 pengine/test10/quorum-1.summary                    |  4 +-
 pengine/test10/quorum-2.dot                        |  1 -
 pengine/test10/quorum-2.exp                        |  6 +-
 pengine/test10/quorum-2.summary                    |  2 +-
 pengine/test10/quorum-3.dot                        |  2 -
 pengine/test10/quorum-3.exp                        | 12 +--
 pengine/test10/quorum-3.summary                    |  4 +-
 pengine/test10/rec-node-10.dot                     |  2 -
 pengine/test10/rec-node-11.dot                     |  2 -
 pengine/test10/rec-node-11.exp                     |  6 --
 pengine/test10/rec-node-4.dot                      |  2 -
 pengine/test10/rec-node-4.exp                      |  6 --
 pengine/test10/rec-node-6.dot                      |  2 -
 pengine/test10/rec-node-6.exp                      |  6 --
 pengine/test10/rec-node-7.dot                      |  2 -
 pengine/test10/rec-node-7.exp                      |  6 --
 pengine/test10/rec-node-8.dot                      |  2 -
 pengine/test10/rec-rsc-0.summary                   |  4 +-
 pengine/test10/rec-rsc-5.dot                       |  1 -
 pengine/test10/rec-rsc-5.exp                       |  3 -
 pengine/test10/rec-rsc-7.summary                   |  4 +-
 pengine/test10/remote-disable.summary              |  2 +-
 .../test10/remote-fence-before-reconnect.summary   |  2 +-
 pengine/test10/remote-fence-unclean-3.summary      |  2 +-
 pengine/test10/remote-fence-unclean-3.xml          | 56 ++++++-------
 pengine/test10/remote-fence-unclean2.summary       |  2 +-
 pengine/test10/remote-probe-disable.summary        |  2 +-
 pengine/test10/remote-reconnect-delay.summary      |  2 +-
 pengine/test10/remote-recover-all.summary          |  4 +-
 pengine/test10/remote-recover-connection.summary   |  4 +-
 pengine/test10/remote-recover-no-resources.summary |  6 +-
 pengine/test10/remote-recover-unknown.summary      |  4 +-
 pengine/test10/remote-recovery.summary             |  4 +-
 pengine/test10/remote-startup-probes.dot           |  2 -
 pengine/test10/remote-startup-probes.exp           | 12 +--
 pengine/test10/remote-startup-probes.summary       |  6 +-
 pengine/test10/rsc-discovery-per-node.dot          |  6 --
 pengine/test10/rsc-discovery-per-node.exp          | 27 +-----
 pengine/test10/rsc-discovery-per-node.summary      | 20 ++---
 pengine/test10/rsc-sets-clone-1.dot                |  1 -
 pengine/test10/rsc-sets-clone-1.exp                |  6 +-
 pengine/test10/rsc-sets-clone-1.summary            | 10 +--
 pengine/test10/rsc_dep4.dot                        |  1 -
 pengine/test10/rsc_dep4.exp                        |  6 +-
 pengine/test10/rsc_dep4.summary                    |  6 +-
 pengine/test10/simple4.summary                     |  2 +-
 pengine/test10/simple6.summary                     |  2 +-
 pengine/test10/simple7.summary                     |  2 +-
 pengine/test10/stopped-monitor-03.summary          |  2 +-
 pengine/test10/stopped-monitor-21.summary          |  2 +-
 pengine/test10/stopped-monitor-22.summary          |  4 +-
 pengine/test10/target-1.summary                    |  2 +-
 pengine/test10/target-2.summary                    |  2 +-
 pengine/test10/ticket-clone-21.summary             |  2 +-
 pengine/test10/ticket-clone-9.summary              |  2 +-
 pengine/test10/ticket-primitive-14.summary         |  2 +-
 pengine/test10/ticket-primitive-15.summary         |  2 +-
 pengine/test10/ticket-primitive-17.summary         |  2 +-
 pengine/test10/ticket-primitive-18.summary         |  2 +-
 pengine/test10/ticket-primitive-20.summary         |  2 +-
 pengine/test10/ticket-primitive-21.summary         |  2 +-
 pengine/test10/ticket-primitive-23.summary         |  2 +-
 pengine/test10/ticket-primitive-3.summary          |  2 +-
 pengine/test10/ticket-primitive-6.summary          |  2 +-
 pengine/test10/ticket-primitive-9.summary          |  2 +-
 pengine/test10/ticket-rsc-sets-10.summary          |  2 +-
 pengine/test10/ticket-rsc-sets-12.summary          |  2 +-
 pengine/test10/ticket-rsc-sets-13.summary          |  2 +-
 pengine/test10/ticket-rsc-sets-14.summary          |  2 +-
 pengine/test10/ticket-rsc-sets-3.summary           |  2 +-
 pengine/test10/ticket-rsc-sets-7.summary           |  2 +-
 pengine/test10/ticket-rsc-sets-9.summary           |  2 +-
 pengine/test10/unfence-definition.dot              |  1 -
 pengine/test10/unfence-definition.exp              |  6 +-
 pengine/test10/unfence-parameters.dot              |  1 -
 pengine/test10/unfence-parameters.exp              |  6 +-
 pengine/test10/unfence-parameters.summary          |  4 +-
 pengine/test10/unmanaged-block-restart.summary     |  4 +-
 pengine/test10/utilization-order1.summary          |  2 +-
 pengine/test10/utilization-order2.summary          |  2 +-
 pengine/test10/utilization-order4.summary          |  2 +-
 pengine/test10/whitebox-migrate1.dot               |  1 -
 pengine/test10/whitebox-migrate1.exp               |  3 -
 pengine/test10/whitebox-move.dot                   |  1 -
 pengine/test10/whitebox-move.exp                   |  6 +-
 pengine/test10/whitebox-move.summary               |  2 +-
 pengine/test10/whitebox-ms-ordering-move.dot       |  4 -
 pengine/test10/whitebox-ms-ordering-move.exp       | 12 ---
 pengine/test10/whitebox-orphan-ms.summary          |  4 +-
 pengine/test10/whitebox-orphaned.dot               |  1 -
 pengine/test10/whitebox-orphaned.exp               |  6 +-
 pengine/test10/whitebox-orphaned.summary           |  6 +-
 pengine/test10/whitebox-start.dot                  |  1 -
 pengine/test10/whitebox-start.exp                  |  6 +-
 pengine/test10/whitebox-start.summary              |  8 +-
 pengine/test10/whitebox-stop.dot                   |  1 -
 pengine/test10/whitebox-stop.exp                   |  6 +-
 pengine/test10/whitebox-stop.summary               |  6 +-
 238 files changed, 557 insertions(+), 1162 deletions(-)

diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot
index f320584..f9b1125 100644
--- a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot
+++ b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot
@@ -12,7 +12,6 @@
 "myclone-clone_stopped_0" -> "myclone-clone_start_0" [ style = bold]
 "myclone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "myclone_monitor_0 f20node2" -> "myclone-clone_start_0" [ style = bold]
-"myclone_monitor_0 f20node2" -> "myclone_stop_0 f20node1" [ style = bold]
 "myclone_monitor_0 f20node2" [ style=bold color="green" fontcolor="black"]
 "myclone_start_0 f20node2" -> "myclone-clone_running_0" [ style = bold]
 "myclone_start_0 f20node2" [ style=bold color="green" fontcolor="black"]
diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
index 76652ab..3f17925 100644
--- a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
+++ b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
@@ -24,9 +24,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="myclone_monitor_0" internal_operation_key="myclone:0_monitor_0" on_node="f20node2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="7" operation="stop" operation_key="myclone-clone_stop_0"/>
       </trigger>
     </inputs>
diff --git a/pengine/test10/594.dot b/pengine/test10/594.dot
index 648a8f6..dcc2795 100644
--- a/pengine/test10/594.dot
+++ b/pengine/test10/594.dot
@@ -1,6 +1,5 @@
 digraph "g" {
 "DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_start_0 hadev1" [ style = bold]
-"DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_stop_0 hadev2" [ style = bold]
 "DcIPaddr_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 hadev1" -> "DcIPaddr_monitor_5000 hadev1" [ style = bold]
@@ -26,7 +25,6 @@ digraph "g" {
 "child_DoFencing:2_stop_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_start_0 hadev1" [ style = bold]
-"rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_stop_0 hadev2" [ style = bold]
 "rsc_hadev2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_start_0 hadev1" -> "rsc_hadev2_monitor_5000 hadev1" [ style = bold]
diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp
index a0b9fe1..fb2e9dd 100644
--- a/pengine/test10/594.exp
+++ b/pengine/test10/594.exp
@@ -38,11 +38,7 @@
         <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
@@ -101,11 +97,7 @@
         <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
diff --git a/pengine/test10/594.summary b/pengine/test10/594.summary
index 4a36789..fc15c50 100644
--- a/pengine/test10/594.summary
+++ b/pengine/test10/594.summary
@@ -21,15 +21,15 @@ Transition Summary:
  * Stop    child_DoFencing:2	(hadev1)  	due to node availability
 
 Executing cluster transition:
+ * Resource action: DcIPaddr        stop on hadev2
  * Resource action: DcIPaddr        monitor on hadev1
  * Resource action: rsc_hadev3      monitor on hadev2
+ * Resource action: rsc_hadev2      stop on hadev2
  * Resource action: rsc_hadev2      monitor on hadev1
  * Resource action: child_DoFencing:0 monitor on hadev1
  * Resource action: child_DoFencing:2 monitor on hadev2
  * Pseudo action:   DoFencing_stop_0
  * Fencing hadev3 (reboot)
- * Resource action: DcIPaddr        stop on hadev2
- * Resource action: rsc_hadev2      stop on hadev2
  * Resource action: child_DoFencing:0 stop on hadev2
  * Resource action: child_DoFencing:2 stop on hadev1
  * Pseudo action:   DoFencing_stopped_0
diff --git a/pengine/test10/662.dot b/pengine/test10/662.dot
index 3287044..524e968 100644
--- a/pengine/test10/662.dot
+++ b/pengine/test10/662.dot
@@ -22,13 +22,10 @@
 "child_DoFencing:3_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
-"rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
-"rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
-"rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold]
diff --git a/pengine/test10/662.exp b/pengine/test10/662.exp
index 4d95ef6..8aa7140 100644
--- a/pengine/test10/662.exp
+++ b/pengine/test10/662.exp
@@ -95,17 +95,7 @@
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="24" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="29" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
-      </trigger>
-    </inputs>
+    <inputs/>
    </synapse>
   <synapse id="9">
     <action_set>
diff --git a/pengine/test10/662.summary b/pengine/test10/662.summary
index a19f71e..569b178 100644
--- a/pengine/test10/662.summary
+++ b/pengine/test10/662.summary
@@ -25,6 +25,7 @@ Executing cluster transition:
  * Resource action: rsc_c001n09     monitor on c001n04
  * Resource action: rsc_c001n09     monitor on c001n03
  * Resource action: rsc_c001n09     monitor on c001n02
+ * Resource action: rsc_c001n02     stop on c001n02
  * Resource action: rsc_c001n02     monitor on c001n09
  * Resource action: rsc_c001n02     monitor on c001n04
  * Resource action: rsc_c001n02     monitor on c001n03
@@ -43,12 +44,11 @@ Executing cluster transition:
  * Resource action: child_DoFencing:3 monitor on c001n03
  * Resource action: child_DoFencing:3 monitor on c001n02
  * Pseudo action:   DoFencing_stop_0
- * Resource action: rsc_c001n02     stop on c001n02
+ * Resource action: rsc_c001n02     start on c001n03
  * Resource action: child_DoFencing:0 stop on c001n02
  * Pseudo action:   DoFencing_stopped_0
  * Cluster action:  do_shutdown on c001n02
  * Pseudo action:   all_stopped
- * Resource action: rsc_c001n02     start on c001n03
  * Resource action: rsc_c001n02     monitor=5000 on c001n03
 
 Revised cluster status:
diff --git a/pengine/test10/696.dot b/pengine/test10/696.dot
index 3fd9569..032e927 100644
--- a/pengine/test10/696.dot
+++ b/pengine/test10/696.dot
@@ -32,10 +32,8 @@
 "child_DoFencing:2_start_0 hadev1" -> "child_DoFencing:2_monitor_5000 hadev1" [ style = bold]
 "child_DoFencing:2_start_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_monitor_0 hadev1" -> "rsc_hadev1_start_0 hadev1" [ style = bold]
-"rsc_hadev1_monitor_0 hadev1" -> "rsc_hadev1_stop_0 hadev3" [ style = bold]
 "rsc_hadev1_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_monitor_0 hadev2" -> "rsc_hadev1_start_0 hadev1" [ style = bold]
-"rsc_hadev1_monitor_0 hadev2" -> "rsc_hadev1_stop_0 hadev3" [ style = bold]
 "rsc_hadev1_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_start_0 hadev1" -> "rsc_hadev1_monitor_5000 hadev1" [ style = bold]
diff --git a/pengine/test10/696.exp b/pengine/test10/696.exp
index 71befb4..74615b1 100644
--- a/pengine/test10/696.exp
+++ b/pengine/test10/696.exp
@@ -85,14 +85,7 @@
         <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc_hadev1_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="rsc_hadev1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="7">
      <action_set>
diff --git a/pengine/test10/696.summary b/pengine/test10/696.summary
index 78e40d1..6f6998a 100644
--- a/pengine/test10/696.summary
+++ b/pengine/test10/696.summary
@@ -18,6 +18,7 @@ Transition Summary:
 Executing cluster transition:
  * Resource action: DcIPaddr        monitor on hadev3
  * Resource action: DcIPaddr        monitor on hadev1
+ * Resource action: rsc_hadev1      stop on hadev3
  * Resource action: rsc_hadev1      monitor on hadev2
  * Resource action: rsc_hadev1      monitor on hadev1
  * Resource action: rsc_hadev2      monitor on hadev3
@@ -35,17 +36,16 @@ Executing cluster transition:
  * Resource action: child_DoFencing:2 monitor on hadev2
  * Resource action: child_DoFencing:2 monitor on hadev1
  * Pseudo action:   DoFencing_start_0
+ * Pseudo action:   all_stopped
  * Resource action: DcIPaddr        start on hadev2
- * Resource action: rsc_hadev1      stop on hadev3
+ * Resource action: rsc_hadev1      start on hadev1
  * Resource action: rsc_hadev2      start on hadev2
  * Resource action: child_DoFencing:2 start on hadev1
  * Pseudo action:   DoFencing_running_0
- * Pseudo action:   all_stopped
  * Resource action: DcIPaddr        monitor=5000 on hadev2
- * Resource action: rsc_hadev1      start on hadev1
+ * Resource action: rsc_hadev1      monitor=5000 on hadev1
  * Resource action: rsc_hadev2      monitor=5000 on hadev2
  * Resource action: child_DoFencing:2 monitor=5000 on hadev1
- * Resource action: rsc_hadev1      monitor=5000 on hadev1
 
 Revised cluster status:
 Online: [ hadev1 hadev2 hadev3 ]
diff --git a/pengine/test10/726.dot b/pengine/test10/726.dot
index 910484a..be2a036 100644
--- a/pengine/test10/726.dot
+++ b/pengine/test10/726.dot
@@ -54,13 +54,10 @@
 "child_DoFencing:3_start_0 sgi2" -> "child_DoFencing:3_monitor_5000 sgi2" [ style = bold]
 "child_DoFencing:3_start_0 sgi2" [ style=bold color="green" fontcolor="black" ]
 "rsc_ibm1_monitor_0 ibm1" -> "rsc_ibm1_start_0 ibm1" [ style = bold]
-"rsc_ibm1_monitor_0 ibm1" -> "rsc_ibm1_stop_0 test03" [ style = bold]
 "rsc_ibm1_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ]
 "rsc_ibm1_monitor_0 sgi2" -> "rsc_ibm1_start_0 ibm1" [ style = bold]
-"rsc_ibm1_monitor_0 sgi2" -> "rsc_ibm1_stop_0 test03" [ style = bold]
 "rsc_ibm1_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ]
 "rsc_ibm1_monitor_0 test02" -> "rsc_ibm1_start_0 ibm1" [ style = bold]
-"rsc_ibm1_monitor_0 test02" -> "rsc_ibm1_stop_0 test03" [ style = bold]
 "rsc_ibm1_monitor_0 test02" [ style=bold color="green" fontcolor="black" ]
 "rsc_ibm1_monitor_5000 ibm1" [ style=bold color="green" fontcolor="black" ]
 "rsc_ibm1_start_0 ibm1" -> "rsc_ibm1_monitor_5000 ibm1" [ style = bold]
diff --git a/pengine/test10/726.exp b/pengine/test10/726.exp
index a1a0be4..737218e 100644
--- a/pengine/test10/726.exp
+++ b/pengine/test10/726.exp
@@ -148,17 +148,7 @@
         <attributes CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="13">
     <action_set>
diff --git a/pengine/test10/726.summary b/pengine/test10/726.summary
index b3cd4e4..f525dcc 100644
--- a/pengine/test10/726.summary
+++ b/pengine/test10/726.summary
@@ -29,6 +29,7 @@ Executing cluster transition:
  * Resource action: rsc_sgi2        monitor on test02
  * Resource action: rsc_sgi2        monitor on sgi2
  * Resource action: rsc_sgi2        monitor on ibm1
+ * Resource action: rsc_ibm1        stop on test03
  * Resource action: rsc_ibm1        monitor on test02
  * Resource action: rsc_ibm1        monitor on sgi2
  * Resource action: rsc_ibm1        monitor on ibm1
@@ -54,23 +55,22 @@ Executing cluster transition:
  * Resource action: child_DoFencing:3 monitor on sgi2
  * Resource action: child_DoFencing:3 monitor on ibm1
  * Pseudo action:   DoFencing_start_0
+ * Pseudo action:   all_stopped
  * Resource action: rsc_sgi2        start on sgi2
- * Resource action: rsc_ibm1        stop on test03
+ * Resource action: rsc_ibm1        start on ibm1
  * Resource action: rsc_test02      start on test02
  * Resource action: child_DoFencing:0 start on test02
  * Resource action: child_DoFencing:1 start on test03
  * Resource action: child_DoFencing:2 start on ibm1
  * Resource action: child_DoFencing:3 start on sgi2
  * Pseudo action:   DoFencing_running_0
- * Pseudo action:   all_stopped
  * Resource action: rsc_sgi2        monitor=5000 on sgi2
- * Resource action: rsc_ibm1        start on ibm1
+ * Resource action: rsc_ibm1        monitor=5000 on ibm1
  * Resource action: rsc_test02      monitor=5000 on test02
  * Resource action: child_DoFencing:0 monitor=5000 on test02
  * Resource action: child_DoFencing:1 monitor=5000 on test03
  * Resource action: child_DoFencing:2 monitor=5000 on ibm1
  * Resource action: child_DoFencing:3 monitor=5000 on sgi2
- * Resource action: rsc_ibm1        monitor=5000 on ibm1
 
 Revised cluster status:
 Online: [ ibm1 sgi2 test02 test03 ]
diff --git a/pengine/test10/764.dot b/pengine/test10/764.dot
index 67b6965..886cbb7 100644
--- a/pengine/test10/764.dot
+++ b/pengine/test10/764.dot
@@ -1,6 +1,5 @@
  digraph "g" {
 "DcIPaddr_monitor_0 posic041" -> "DcIPaddr_start_0 posic043" [ style = dashed]
-"DcIPaddr_monitor_0 posic041" -> "DcIPaddr_stop_0 posic043" [ style = bold]
 "DcIPaddr_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 posic043" [ style=dashed color="red" fontcolor="black"]
 "DcIPaddr_start_0 posic043" -> "DcIPaddr_monitor_5000 posic043" [ style = dashed]
@@ -15,7 +14,6 @@
 "child_DoFencing:2_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic041_monitor_0 posic043" -> "rsc_posic041_start_0 posic041" [ style = dashed]
-"rsc_posic041_monitor_0 posic043" -> "rsc_posic041_stop_0 posic041" [ style = bold]
 "rsc_posic041_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic041_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"]
 "rsc_posic041_start_0 posic041" -> "rsc_posic041_monitor_5000 posic041" [ style = dashed]
@@ -24,7 +22,6 @@
 "rsc_posic041_stop_0 posic041" -> "rsc_posic041_start_0 posic041" [ style = dashed]
 "rsc_posic041_stop_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic042_monitor_0 posic043" -> "rsc_posic042_start_0 posic041" [ style = dashed]
-"rsc_posic042_monitor_0 posic043" -> "rsc_posic042_stop_0 posic041" [ style = bold]
 "rsc_posic042_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic042_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"]
 "rsc_posic042_start_0 posic041" -> "rsc_posic042_monitor_5000 posic041" [ style = dashed]
@@ -33,7 +30,6 @@
 "rsc_posic042_stop_0 posic041" -> "rsc_posic042_start_0 posic041" [ style = dashed]
 "rsc_posic042_stop_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic043_monitor_0 posic041" -> "rsc_posic043_start_0 posic043" [ style = dashed]
-"rsc_posic043_monitor_0 posic041" -> "rsc_posic043_stop_0 posic043" [ style = bold]
 "rsc_posic043_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic043_monitor_5000 posic043" [ style=dashed color="red" fontcolor="black"]
 "rsc_posic043_start_0 posic043" -> "rsc_posic043_monitor_5000 posic043" [ style = dashed]
@@ -42,7 +38,6 @@
 "rsc_posic043_stop_0 posic043" -> "rsc_posic043_start_0 posic043" [ style = dashed]
 "rsc_posic043_stop_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic044_monitor_0 posic043" -> "rsc_posic044_start_0 posic041" [ style = dashed]
-"rsc_posic044_monitor_0 posic043" -> "rsc_posic044_stop_0 posic041" [ style = bold]
 "rsc_posic044_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic044_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"]
 "rsc_posic044_start_0 posic041" -> "rsc_posic044_monitor_5000 posic041" [ style = dashed]
diff --git a/pengine/test10/764.exp b/pengine/test10/764.exp
index 5101644..1f5b7c8 100644
--- a/pengine/test10/764.exp
+++ b/pengine/test10/764.exp
@@ -6,11 +6,7 @@
         <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="1">
      <action_set>
@@ -28,11 +24,7 @@
         <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="rsc_posic041_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="3">
      <action_set>
@@ -50,11 +42,7 @@
         <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="rsc_posic042_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="5">
      <action_set>
@@ -72,11 +60,7 @@
         <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="rsc_posic043_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="7">
      <action_set>
@@ -94,11 +78,7 @@
         <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc_posic044_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="9">
     <action_set>
diff --git a/pengine/test10/764.summary b/pengine/test10/764.summary
index ea62931..b50cdd4 100644
--- a/pengine/test10/764.summary
+++ b/pengine/test10/764.summary
@@ -22,21 +22,21 @@ Transition Summary:
  * Stop       rsc_posic044     ( posic041 )   due to no quorum
 
 Executing cluster transition:
+ * Resource action: DcIPaddr        stop on posic043
  * Resource action: DcIPaddr        monitor on posic041
+ * Resource action: rsc_posic041    stop on posic041
  * Resource action: rsc_posic041    monitor on posic043
+ * Resource action: rsc_posic042    stop on posic041
  * Resource action: rsc_posic042    monitor on posic043
+ * Resource action: rsc_posic043    stop on posic043
  * Resource action: rsc_posic043    monitor on posic041
+ * Resource action: rsc_posic044    stop on posic041
  * Resource action: rsc_posic044    monitor on posic043
  * Resource action: child_DoFencing:0 monitor=5000 on posic043
  * Resource action: child_DoFencing:1 monitor=5000 on posic041
  * Resource action: child_DoFencing:1 monitor on posic043
  * Resource action: child_DoFencing:2 monitor on posic041
  * Resource action: child_DoFencing:3 monitor on posic041
- * Resource action: DcIPaddr        stop on posic043
- * Resource action: rsc_posic041    stop on posic041
- * Resource action: rsc_posic042    stop on posic041
- * Resource action: rsc_posic043    stop on posic043
- * Resource action: rsc_posic044    stop on posic041
  * Pseudo action:   all_stopped
 
 Revised cluster status:
diff --git a/pengine/test10/797.dot b/pengine/test10/797.dot
index 5afc1a6..d02f0b6 100644
--- a/pengine/test10/797.dot
+++ b/pengine/test10/797.dot
@@ -2,7 +2,6 @@
 "DcIPaddr_delete_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
 "DcIPaddr_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
-"DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_stop_0 c001n03" [ style = bold]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n02" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
 "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
@@ -51,7 +50,6 @@
 "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n03" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
-"rsc_c001n01_monitor_0 c001n03" -> "rsc_c001n01_stop_0 c001n01" [ style = bold]
 "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black"]
 "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
@@ -60,10 +58,8 @@
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = dashed]
-"rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = dashed]
-"rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = dashed]
@@ -73,7 +69,6 @@
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n01" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
-"rsc_c001n03_monitor_0 c001n01" -> "rsc_c001n03_stop_0 c001n03" [ style = bold]
 "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n02" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
@@ -84,10 +79,8 @@
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_start_0 c001n01" [ style = dashed]
-"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_stop_0 c001n02" [ style = bold]
 "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_start_0 c001n01" [ style = dashed]
-"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_stop_0 c001n02" [ style = bold]
 "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n01" -> "rsc_c001n08_monitor_5000 c001n01" [ style = dashed]
diff --git a/pengine/test10/797.exp b/pengine/test10/797.exp
index 4b83374..eb78641 100644
--- a/pengine/test10/797.exp
+++ b/pengine/test10/797.exp
@@ -37,11 +37,7 @@
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
@@ -50,14 +46,7 @@
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="14" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-      </trigger>
-    </inputs>
+    <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
@@ -84,14 +73,7 @@
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-      </trigger>
-    </inputs>
+    <inputs/>
    </synapse>
   <synapse id="8">
      <action_set>
@@ -118,11 +100,7 @@
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="16" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="11">
      <action_set>
@@ -149,11 +127,7 @@
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="14">
      <action_set>
diff --git a/pengine/test10/797.summary b/pengine/test10/797.summary
index 61afbf1..47db825 100644
--- a/pengine/test10/797.summary
+++ b/pengine/test10/797.summary
@@ -28,12 +28,16 @@ Executing cluster transition:
  * Resource action: DcIPaddr        monitor on c001n02
  * Resource action: DcIPaddr        monitor on c001n01
  * Resource action: DcIPaddr        stop on c001n03
+ * Resource action: rsc_c001n08     stop on c001n02
  * Resource action: rsc_c001n08     monitor on c001n03
  * Resource action: rsc_c001n08     monitor on c001n01
+ * Resource action: rsc_c001n02     stop on c001n02
  * Resource action: rsc_c001n02     monitor on c001n03
  * Resource action: rsc_c001n02     monitor on c001n01
+ * Resource action: rsc_c001n03     stop on c001n03
  * Resource action: rsc_c001n03     monitor on c001n02
  * Resource action: rsc_c001n03     monitor on c001n01
+ * Resource action: rsc_c001n01     stop on c001n01
  * Resource action: rsc_c001n01     monitor on c001n03
  * Resource action: child_DoFencing:2 monitor on c001n01
  * Resource action: child_DoFencing:3 monitor on c001n03
@@ -41,10 +45,6 @@ Executing cluster transition:
  * Resource action: child_DoFencing:3 monitor on c001n01
  * Pseudo action:   DoFencing_stop_0
  * Resource action: DcIPaddr        delete on c001n03
- * Resource action: rsc_c001n08     stop on c001n02
- * Resource action: rsc_c001n02     stop on c001n02
- * Resource action: rsc_c001n03     stop on c001n03
- * Resource action: rsc_c001n01     stop on c001n01
  * Resource action: child_DoFencing:0 stop on c001n03
  * Resource action: child_DoFencing:0 stop on c001n01
  * Resource action: child_DoFencing:1 stop on c001n02
diff --git a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary
index 06a1356..99d5c09 100644
--- a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary
+++ b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary
@@ -8,7 +8,7 @@ Online: [ 18node1 18node2 18node3 ]
 
 Transition Summary:
  * Migrate    A       ( 18node1 -> 18node2 )  
- * Stop    B	(18node2)
+ * Stop       B       (            18node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: B               stop on 18node2
diff --git a/pengine/test10/829.dot b/pengine/test10/829.dot
index a0ea381..1daa2aa 100644
--- a/pengine/test10/829.dot
+++ b/pengine/test10/829.dot
@@ -18,13 +18,10 @@ digraph "g" {
 "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = bold]
-"rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = bold]
-"rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_start_0 c001n01" [ style = bold]
-"rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
 "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = bold]
diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp
index a1617b9..ed8be6e 100644
--- a/pengine/test10/829.exp
+++ b/pengine/test10/829.exp
@@ -83,15 +83,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
-      <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="19" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
diff --git a/pengine/test10/bug-1572-1.summary b/pengine/test10/bug-1572-1.summary
index 7715980..7ca83a9 100644
--- a/pengine/test10/bug-1572-1.summary
+++ b/pengine/test10/bug-1572-1.summary
@@ -13,7 +13,7 @@ Online: [ arc-dknightlx arc-tkincaidlx.wsicorp.com ]
 Transition Summary:
  * Shutdown arc-dknightlx
  * Stop       rsc_drbd_7788:0          (               Slave arc-dknightlx )   due to node availability
- * Restart rsc_drbd_7788:1	(Master arc-tkincaidlx.wsicorp.com)
+ * Restart    rsc_drbd_7788:1          ( Master arc-tkincaidlx.wsicorp.com )   due to resource definition change
  * Restart    fs_mirror                (        arc-tkincaidlx.wsicorp.com )   due to required ms_drbd_7788 notified
  * Restart    pgsql_5555               (        arc-tkincaidlx.wsicorp.com )   due to required fs_mirror start
  * Restart    IPaddr_147_81_84_133     (        arc-tkincaidlx.wsicorp.com )   due to required pgsql_5555 start
diff --git a/pengine/test10/bug-5025-3.summary b/pengine/test10/bug-5025-3.summary
index 9072771..720b462 100644
--- a/pengine/test10/bug-5025-3.summary
+++ b/pengine/test10/bug-5025-3.summary
@@ -8,7 +8,7 @@ OFFLINE: [ fc16-builder2 fc16-builder3 ]
  B	(ocf::pacemaker:Dummy):	Started fc16-builder
 
 Transition Summary:
- * Restart    A       ( fc16-builder )  
+ * Restart    A       ( fc16-builder )   due to resource definition change
 
 Executing cluster transition:
  * Resource action: A               stop on fc16-builder
diff --git a/pengine/test10/bug-5028.summary b/pengine/test10/bug-5028.summary
index f1c6f63..4a8556b 100644
--- a/pengine/test10/bug-5028.summary
+++ b/pengine/test10/bug-5028.summary
@@ -8,7 +8,7 @@ Online: [ bl460g6a bl460g6b ]
 
 Transition Summary:
  * Shutdown bl460g6a
- * Stop       dummy01     ( bl460g6a )   blocked
+ * Stop       dummy01     ( bl460g6a )   due to unrunnable dummy02 stop (blocked)
 
 Executing cluster transition:
  * Pseudo action:   dummy-g_stop_0
diff --git a/pengine/test10/bug-cl-5219.summary b/pengine/test10/bug-cl-5219.summary
index 3a25265..c9ee54a 100644
--- a/pengine/test10/bug-cl-5219.summary
+++ b/pengine/test10/bug-cl-5219.summary
@@ -17,7 +17,7 @@ Online: [ ha1.test.anchor.net.au ha2.test.anchor.net.au ]
      Slaves: [ ha1.test.anchor.net.au ]
 
 Transition Summary:
- * Stop    child1-service	(ha2.test.anchor.net.au)
+ * Stop       child1-service     ( ha2.test.anchor.net.au )   due to node availability
 
 Executing cluster transition:
  * Resource action: child1-service  stop on ha2.test.anchor.net.au
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
index 99c00e9..dbb612c 100644
--- a/pengine/test10/bug-cl-5247.summary
+++ b/pengine/test10/bug-cl-5247.summary
@@ -20,12 +20,12 @@ Containers: [ pgsr01:prmDB1 ]
 Transition Summary:
  * Fence (off) pgsr02 (resource: prmDB2) 'guest is unclean'
  * Stop    prmDB2	(bl460g8n4)  	due to node availability
- * Restart    prmStonith1-2     (        bl460g8n4 )  
- * Restart    prmStonith2-2     (        bl460g8n3 )  
+ * Restart    prmStonith1-2     (        bl460g8n4 )   due to resource definition change
+ * Restart    prmStonith2-2     (        bl460g8n3 )   due to resource definition change
  * Recover    vip-master        ( pgsr02 -> pgsr01 )  
  * Recover    vip-rep           ( pgsr02 -> pgsr01 )  
  * Stop       pgsql:0           (    Master pgsr02 )   due to node availability
- * Stop    pgsr02	(bl460g8n4)
+ * Stop       pgsr02            (        bl460g8n4 )   due to node availability
 
 Executing cluster transition:
  * Pseudo action:   grpStonith1_stop_0
diff --git a/pengine/test10/bug-lf-2106.summary b/pengine/test10/bug-lf-2106.summary
index 1cea829..0c7c485 100644
--- a/pengine/test10/bug-lf-2106.summary
+++ b/pengine/test10/bug-lf-2106.summary
@@ -35,8 +35,8 @@ Online: [ cl-virt-1 cl-virt-2 ]
      Slaves: [ cl-virt-1 ]
 
 Transition Summary:
- * Restart    pingd:0     ( cl-virt-1 )  
- * Restart    pingd:1     ( cl-virt-2 )  
+ * Restart    pingd:0     ( cl-virt-1 )   due to resource definition change
+ * Restart    pingd:1     ( cl-virt-2 )   due to resource definition change
 
 Executing cluster transition:
  * Cluster action:  clear_failcount for pingd on cl-virt-1
diff --git a/pengine/test10/bug-lf-2435.summary b/pengine/test10/bug-lf-2435.summary
index bb07089..3d75500 100644
--- a/pengine/test10/bug-lf-2435.summary
+++ b/pengine/test10/bug-lf-2435.summary
@@ -10,7 +10,7 @@ Online: [ c19.chepkov.lan c21.chepkov.lan ]
 
 Transition Summary:
  * Move       dummy2     ( c20.chepkov.lan -> c21.chepkov.lan )  
- * Stop    dummy3	(c21.chepkov.lan)
+ * Stop       dummy3     (                    c21.chepkov.lan )   due to node availability
 
 Executing cluster transition:
  * Resource action: dummy2          stop on c20.chepkov.lan
diff --git a/pengine/test10/bug-lf-2551.summary b/pengine/test10/bug-lf-2551.summary
index 1cd5108..a1686ed 100644
--- a/pengine/test10/bug-lf-2551.summary
+++ b/pengine/test10/bug-lf-2551.summary
@@ -90,22 +90,22 @@ Transition Summary:
  * Stop    cmirrord:3	(hex-9)  	due to node availability
  * Stop    vg1:3	(hex-9)  	due to node availability
  * Stop    ocfs2-1:3	(hex-9)  	due to node availability
- * Stop    vm-03	(hex-9)
- * Stop    vm-06	(hex-9)
- * Stop    vm-09	(hex-9)
- * Stop    vm-13	(hex-9)
- * Stop    vm-17	(hex-9)
- * Stop    vm-21	(hex-9)
- * Stop    vm-25	(hex-9)
- * Stop    vm-29	(hex-9)
- * Stop    vm-33	(hex-9)
- * Stop    vm-37	(hex-9)
- * Stop    vm-41	(hex-9)
- * Stop    vm-45	(hex-9)
- * Stop    vm-49	(hex-9)
- * Stop    vm-53	(hex-9)
- * Stop    vm-57	(hex-9)
- * Stop    vm-61	(hex-9)
+ * Stop       vm-03           (          hex-9 )   due to node availability
+ * Stop       vm-06           (          hex-9 )   due to node availability
+ * Stop       vm-09           (          hex-9 )   due to node availability
+ * Stop       vm-13           (          hex-9 )   due to node availability
+ * Stop       vm-17           (          hex-9 )   due to node availability
+ * Stop       vm-21           (          hex-9 )   due to node availability
+ * Stop       vm-25           (          hex-9 )   due to node availability
+ * Stop       vm-29           (          hex-9 )   due to node availability
+ * Stop       vm-33           (          hex-9 )   due to node availability
+ * Stop       vm-37           (          hex-9 )   due to node availability
+ * Stop       vm-41           (          hex-9 )   due to node availability
+ * Stop       vm-45           (          hex-9 )   due to node availability
+ * Stop       vm-49           (          hex-9 )   due to node availability
+ * Stop       vm-53           (          hex-9 )   due to node availability
+ * Stop       vm-57           (          hex-9 )   due to node availability
+ * Stop       vm-61           (          hex-9 )   due to node availability
 
 Executing cluster transition:
  * Pseudo action:   fencing-sbd_stop_0
diff --git a/pengine/test10/bug-lf-2606.summary b/pengine/test10/bug-lf-2606.summary
index d3fdb24..ef30bac 100644
--- a/pengine/test10/bug-lf-2606.summary
+++ b/pengine/test10/bug-lf-2606.summary
@@ -13,7 +13,7 @@ Online: [ node1 ]
 
 Transition Summary:
  * Fence (reboot) node2 'rsc1 failed there'
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (          node2 )   due to node availability
  * Move       rsc2       ( node2 -> node1 )  
  * Stop       rsc3:1     (   Master node2 )   due to node availability
 
diff --git a/pengine/test10/bug-n-387749.dot b/pengine/test10/bug-n-387749.dot
index 863a348..886f337 100644
--- a/pengine/test10/bug-n-387749.dot
+++ b/pengine/test10/bug-n-387749.dot
@@ -43,7 +43,6 @@ digraph "g" {
 "group_nfs_stopped_0" -> "group_nfs_start_0" [ style = bold]
 "group_nfs_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold]
-"resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold]
 "resource_ipaddr1_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
 "resource_ipaddr1_single_monitor_5000 power720-1" [ style=bold color="green" fontcolor="black" ]
 "resource_ipaddr1_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold]
@@ -55,7 +54,6 @@ digraph "g" {
 "resource_ipaddr1_single_stop_0 power720-2" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold]
 "resource_ipaddr1_single_stop_0 power720-2" [ style=bold color="green" fontcolor="black" ]
 "resource_nfsserver_single_monitor_0 power720-1" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold]
-"resource_nfsserver_single_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold]
 "resource_nfsserver_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ]
 "resource_nfsserver_single_monitor_15000 power720-1" [ style=bold color="green" fontcolor="black" ]
 "resource_nfsserver_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold]
diff --git a/pengine/test10/bug-n-387749.exp b/pengine/test10/bug-n-387749.exp
index bba3012..80f91bb 100644
--- a/pengine/test10/bug-n-387749.exp
+++ b/pengine/test10/bug-n-387749.exp
@@ -270,9 +270,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="resource_ipaddr1_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/>
-       </trigger>
-       <trigger>
         <rsc_op id="27" operation="stop" operation_key="resource_nfsserver_single_stop_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10"/>
        </trigger>
        <trigger>
@@ -333,9 +330,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="resource_nfsserver_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="32" operation="stop" operation_key="group_nfs_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/bug-n-387749.summary b/pengine/test10/bug-n-387749.summary
index 9ef7e70..9959ce7 100644
--- a/pengine/test10/bug-n-387749.summary
+++ b/pengine/test10/bug-n-387749.summary
@@ -23,17 +23,17 @@ Executing cluster transition:
  * Pseudo action:   export_home_ocfs2_clone_set_pre_notify_start_0
  * Pseudo action:   group_nfs_stop_0
  * Resource action: resource_ipaddr1_single monitor on power720-1
+ * Resource action: resource_nfsserver_single stop on power720-2
  * Resource action: resource_nfsserver_single monitor on power720-1
  * Resource action: export_home_ocfs2:1 notify on power720-2
  * Pseudo action:   export_home_ocfs2_clone_set_confirmed-pre_notify_start_0
  * Pseudo action:   export_home_ocfs2_clone_set_start_0
- * Resource action: resource_nfsserver_single stop on power720-2
- * Resource action: export_home_ocfs2:0 start on power720-1
- * Pseudo action:   export_home_ocfs2_clone_set_running_0
  * Resource action: resource_ipaddr1_single stop on power720-2
  * Pseudo action:   all_stopped
- * Pseudo action:   export_home_ocfs2_clone_set_post_notify_running_0
+ * Resource action: export_home_ocfs2:0 start on power720-1
+ * Pseudo action:   export_home_ocfs2_clone_set_running_0
  * Pseudo action:   group_nfs_stopped_0
+ * Pseudo action:   export_home_ocfs2_clone_set_post_notify_running_0
  * Resource action: export_home_ocfs2:0 notify on power720-1
  * Resource action: export_home_ocfs2:1 notify on power720-2
  * Pseudo action:   export_home_ocfs2_clone_set_confirmed-post_notify_running_0
diff --git a/pengine/test10/bug-pm-12.summary b/pengine/test10/bug-pm-12.summary
index 312e4a2..1ec6b8d 100644
--- a/pengine/test10/bug-pm-12.summary
+++ b/pengine/test10/bug-pm-12.summary
@@ -11,8 +11,8 @@ Online: [ node-a node-b ]
          stateful-2:1	(ocf::heartbeat:Stateful):	Master node-a
 
 Transition Summary:
- * Restart stateful-2:0	(Slave node-b)
- * Restart stateful-2:1	(Master node-a)
+ * Restart    stateful-2:0     (  Slave node-b )   due to resource definition change
+ * Restart    stateful-2:1     ( Master node-a )   due to resource definition change
 
 Executing cluster transition:
  * Pseudo action:   ms-sf_demote_0
diff --git a/pengine/test10/bug-rh-1097457.dot b/pengine/test10/bug-rh-1097457.dot
index 512510e..5984811 100644
--- a/pengine/test10/bug-rh-1097457.dot
+++ b/pengine/test10/bug-rh-1097457.dot
@@ -6,10 +6,8 @@ digraph "g" {
 "FAKE3-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
 "FAKE3_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
 "FAKE4-IP_monitor_0 lamaVM1" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
-"FAKE4-IP_monitor_0 lamaVM1" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold]
 "FAKE4-IP_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"]
 "FAKE4-IP_monitor_0 lamaVM3" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
-"FAKE4-IP_monitor_0 lamaVM3" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold]
 "FAKE4-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
 "FAKE4-IP_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"]
 "FAKE4-IP_start_0 lamaVM2" -> "FAKE4-IP_monitor_30000 lamaVM2" [ style = bold]
@@ -21,10 +19,8 @@ digraph "g" {
 "FAKE4-IP_stop_0 lamaVM2" -> "lamaVM2-G4_stopped_0" [ style = bold]
 "FAKE4-IP_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"]
 "FAKE4_monitor_0 lamaVM1" -> "FAKE4_start_0 lamaVM2" [ style = bold]
-"FAKE4_monitor_0 lamaVM1" -> "FAKE4_stop_0 lamaVM2" [ style = bold]
 "FAKE4_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_0 lamaVM3" -> "FAKE4_start_0 lamaVM2" [ style = bold]
-"FAKE4_monitor_0 lamaVM3" -> "FAKE4_stop_0 lamaVM2" [ style = bold]
 "FAKE4_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"]
 "FAKE4_start_0 lamaVM2" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp
index e7e0e67..4eedd91 100644
--- a/pengine/test10/bug-rh-1097457.exp
+++ b/pengine/test10/bug-rh-1097457.exp
@@ -353,12 +353,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="31" operation="monitor" operation_key="FAKE4_monitor_0" on_node="lamaVM1" on_node_uuid="lamaVM1" router_node="lama2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="44" operation="monitor" operation_key="FAKE4_monitor_0" on_node="lamaVM3" on_node_uuid="lamaVM3" router_node="lama3"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="93" operation="stop" operation_key="FAKE4-IP_stop_0"/>
       </trigger>
       <trigger>
@@ -445,12 +439,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="monitor" operation_key="FAKE4-IP_monitor_0" on_node="lamaVM1" on_node_uuid="lamaVM1" router_node="lama2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="45" operation="monitor" operation_key="FAKE4-IP_monitor_0" on_node="lamaVM3" on_node_uuid="lamaVM3" router_node="lama3"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="97" operation="stop" operation_key="lamaVM2-G4_stop_0"/>
       </trigger>
       <trigger>
diff --git a/pengine/test10/bundle-nested-colocation.exp b/pengine/test10/bundle-nested-colocation.exp
index 315c4be..a50809c 100644
--- a/pengine/test10/bundle-nested-colocation.exp
+++ b/pengine/test10/bundle-nested-colocation.exp
@@ -302,7 +302,7 @@
     <action_set>
       <rsc_op id="41" operation="stop" operation_key="rabbitmq-bundle-docker-0_stop_0" on_node="overcloud-rabbit-0" on_node_uuid="overcloud-rabbit-0" router_node="overcloud-controller-0">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="overcloud-rabbit-0" CRM_meta_on_node_uuid="overcloud-rabbit-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="overcloud-rabbit-0" CRM_meta_on_node_uuid="overcloud-rabbit-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -315,7 +315,7 @@
     <action_set>
       <rsc_op id="11" operation="start" operation_key="rabbitmq-bundle-docker-0_start_0" on_node="overcloud-rabbit-0" on_node_uuid="overcloud-rabbit-0" router_node="overcloud-controller-0">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="overcloud-rabbit-0" CRM_meta_on_node_uuid="overcloud-rabbit-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="overcloud-rabbit-0" CRM_meta_on_node_uuid="overcloud-rabbit-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -331,7 +331,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="rabbitmq-bundle-docker-0_monitor_60000" on_node="overcloud-rabbit-0" on_node_uuid="overcloud-rabbit-0" router_node="overcloud-controller-0">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-rabbit-0" CRM_meta_on_node_uuid="overcloud-rabbit-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-rabbit-0" CRM_meta_on_node_uuid="overcloud-rabbit-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -466,7 +466,7 @@
     <action_set>
       <rsc_op id="44" operation="stop" operation_key="rabbitmq-bundle-docker-1_stop_0" on_node="overcloud-rabbit-1" on_node_uuid="overcloud-rabbit-1" router_node="overcloud-controller-1">
         <primitive id="rabbitmq-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="overcloud-rabbit-1" CRM_meta_on_node_uuid="overcloud-rabbit-1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="overcloud-rabbit-1" CRM_meta_on_node_uuid="overcloud-rabbit-1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -479,7 +479,7 @@
     <action_set>
       <rsc_op id="12" operation="start" operation_key="rabbitmq-bundle-docker-1_start_0" on_node="overcloud-rabbit-1" on_node_uuid="overcloud-rabbit-1" router_node="overcloud-controller-1">
         <primitive id="rabbitmq-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="overcloud-rabbit-1" CRM_meta_on_node_uuid="overcloud-rabbit-1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="overcloud-rabbit-1" CRM_meta_on_node_uuid="overcloud-rabbit-1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -495,7 +495,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="rabbitmq-bundle-docker-1_monitor_60000" on_node="overcloud-rabbit-1" on_node_uuid="overcloud-rabbit-1" router_node="overcloud-controller-1">
         <primitive id="rabbitmq-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-rabbit-1" CRM_meta_on_node_uuid="overcloud-rabbit-1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-rabbit-1" CRM_meta_on_node_uuid="overcloud-rabbit-1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -630,7 +630,7 @@
     <action_set>
       <rsc_op id="47" operation="stop" operation_key="rabbitmq-bundle-docker-2_stop_0" on_node="overcloud-rabbit-2" on_node_uuid="overcloud-rabbit-2" router_node="overcloud-controller-2">
         <primitive id="rabbitmq-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="overcloud-rabbit-2" CRM_meta_on_node_uuid="overcloud-rabbit-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="overcloud-rabbit-2" CRM_meta_on_node_uuid="overcloud-rabbit-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -643,7 +643,7 @@
     <action_set>
       <rsc_op id="13" operation="start" operation_key="rabbitmq-bundle-docker-2_start_0" on_node="overcloud-rabbit-2" on_node_uuid="overcloud-rabbit-2" router_node="overcloud-controller-2">
         <primitive id="rabbitmq-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="overcloud-rabbit-2" CRM_meta_on_node_uuid="overcloud-rabbit-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="overcloud-rabbit-2" CRM_meta_on_node_uuid="overcloud-rabbit-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -659,7 +659,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="rabbitmq-bundle-docker-2_monitor_60000" on_node="overcloud-rabbit-2" on_node_uuid="overcloud-rabbit-2" router_node="overcloud-controller-2">
         <primitive id="rabbitmq-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-rabbit-2" CRM_meta_on_node_uuid="overcloud-rabbit-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-rabbit-2" CRM_meta_on_node_uuid="overcloud-rabbit-2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-nested-colocation.summary b/pengine/test10/bundle-nested-colocation.summary
index 2eee05e..7464d15 100644
--- a/pengine/test10/bundle-nested-colocation.summary
+++ b/pengine/test10/bundle-nested-colocation.summary
@@ -17,13 +17,13 @@ RemoteOnline: [ overcloud-rabbit-0 overcloud-rabbit-1 overcloud-rabbit-2 ]
    galera-bundle-docker-2	(ocf::heartbeat:docker):	Started overcloud-galera-2
 
 Transition Summary:
- * Restart    rabbitmq-bundle-docker-0     (     overcloud-rabbit-0 )  
+ * Restart    rabbitmq-bundle-docker-0     (     overcloud-rabbit-0 )   due to resource definition change
  * Start   rabbitmq-bundle-0	(overcloud-controller-0)
  * Start   rabbitmq:0	(rabbitmq-bundle-0)
- * Restart    rabbitmq-bundle-docker-1     (     overcloud-rabbit-1 )  
+ * Restart    rabbitmq-bundle-docker-1     (     overcloud-rabbit-1 )   due to resource definition change
  * Start   rabbitmq-bundle-1	(overcloud-controller-1)
  * Start   rabbitmq:1	(rabbitmq-bundle-1)
- * Restart    rabbitmq-bundle-docker-2     (     overcloud-rabbit-2 )  
+ * Restart    rabbitmq-bundle-docker-2     (     overcloud-rabbit-2 )   due to resource definition change
  * Start   rabbitmq-bundle-2	(overcloud-controller-2)
  * Start   rabbitmq:2	(rabbitmq-bundle-2)
 
diff --git a/pengine/test10/bundle-nested-colocation.xml b/pengine/test10/bundle-nested-colocation.xml
index d8f6139..7b5b2c4 100644
--- a/pengine/test10/bundle-nested-colocation.xml
+++ b/pengine/test10/bundle-nested-colocation.xml
@@ -165,7 +165,7 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;7:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="16" rc-code="7" op-status="0" interval="0" last-run="1500022210" last-rc-change="1500022210" exec-time="58" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
           </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;8:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="20" rc-code="7" op-status="0" interval="0" last-run="1500022218" last-rc-change="1500022218" exec-time="79" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;8:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="20" rc-code="7" op-status="0" interval="0" last-run="1500022218" last-rc-change="1500022218" exec-time="79" queue-time="0" op-digest="4672b28c350bc4f5445fd6678c0c2a56"/>
           </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="9:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;9:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1500022219" last-rc-change="1500022219" exec-time="55" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
@@ -242,8 +242,8 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="16:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;16:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-0" call-id="16" rc-code="7" op-status="0" interval="0" last-run="1500022209" last-rc-change="1500022209" exec-time="61" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
           </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="20:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;20:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-0" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1500022223" last-rc-change="1500022223" exec-time="443" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
-            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="21:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;21:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-0" call-id="30" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022224" exec-time="111" queue-time="0" op-digest="6c62dd04c49dcf10a0537520dee31ac4"/>
+            <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="20:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;20:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-0" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1500022223" last-rc-change="1500022223" exec-time="443" queue-time="0" op-digest="4672b28c350bc4f5445fd6678c0c2a56"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="21:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;21:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-0" call-id="30" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022224" exec-time="111" queue-time="0" op-digest="4b2ba27785766c4876e892f67e694055"/>
           </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="18:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;18:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-0" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1500022218" last-rc-change="1500022218" exec-time="43" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
@@ -323,8 +323,8 @@
             <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="20:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;20:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-1" call-id="20" rc-code="7" op-status="0" interval="0" last-run="1500022218" last-rc-change="1500022218" exec-time="59" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
           </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="22:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;22:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-1" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1500022223" last-rc-change="1500022223" exec-time="463" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
-            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="23:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;23:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-1" call-id="30" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022224" exec-time="104" queue-time="1" op-digest="6c62dd04c49dcf10a0537520dee31ac4"/>
+            <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="22:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;22:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-1" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1500022223" last-rc-change="1500022223" exec-time="463" queue-time="0" op-digest="4672b28c350bc4f5445fd6678c0c2a56"/>
+            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="23:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;23:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-1" call-id="30" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022224" exec-time="104" queue-time="1" op-digest="4b2ba27785766c4876e892f67e694055"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="22:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;22:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-1" call-id="28" rc-code="7" op-status="0" interval="0" last-run="1500022219" last-rc-change="1500022219" exec-time="86" queue-time="1" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
@@ -365,8 +365,8 @@
             <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="24:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;24:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-2" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1500022218" last-rc-change="1500022218" exec-time="67" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="24:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;24:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-2" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1500022223" last-rc-change="1500022223" exec-time="532" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
-            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="25:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;25:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-2" call-id="30" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022224" exec-time="84" queue-time="0" op-digest="6c62dd04c49dcf10a0537520dee31ac4"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="24:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;24:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-2" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1500022223" last-rc-change="1500022223" exec-time="532" queue-time="0" op-digest="4672b28c350bc4f5445fd6678c0c2a56"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="25:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;25:20:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-galera-2" call-id="30" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022224" exec-time="84" queue-time="0" op-digest="4b2ba27785766c4876e892f67e694055"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -380,8 +380,8 @@
       <lrm id="overcloud-rabbit-0">
         <lrm_resources>
           <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="11:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;11:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="101" rc-code="0" op-status="0" interval="0" last-run="1500022215" last-rc-change="1500022215" exec-time="743" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="12:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;12:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="106" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022216" exec-time="116" queue-time="0" op-digest="f30bc9d35a6373a2e10bc481ae6aaf8d"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="11:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;11:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="101" rc-code="0" op-status="0" interval="0" last-run="1500022215" last-rc-change="1500022215" exec-time="743" queue-time="0" op-digest="8c0a285f208d4d9a67aff645d6afa451"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="12:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;12:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="106" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022216" exec-time="116" queue-time="0" op-digest="22abb108ae9d2c7687fd55cec05e3eb1"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="24:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;24:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-0" call-id="80" rc-code="7" op-status="0" interval="0" last-run="1500022209" last-rc-change="1500022209" exec-time="34" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
@@ -408,8 +408,8 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="26:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;26:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-1" call-id="16" rc-code="7" op-status="0" interval="0" last-run="1500022209" last-rc-change="1500022209" exec-time="41" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="13:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;13:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-1" call-id="25" rc-code="0" op-status="0" interval="0" last-run="1500022215" last-rc-change="1500022215" exec-time="839" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;14:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-1" call-id="26" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022216" exec-time="171" queue-time="0" op-digest="f30bc9d35a6373a2e10bc481ae6aaf8d"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="13:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;13:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-1" call-id="25" rc-code="0" op-status="0" interval="0" last-run="1500022215" last-rc-change="1500022215" exec-time="839" queue-time="0" op-digest="f16474ea54754bd1c314820340573331"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;14:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-1" call-id="26" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022216" exec-time="171" queue-time="0" op-digest="77a7f86a24beebea976cd186a4b67311"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="28:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;28:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-1" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1500022209" last-rc-change="1500022209" exec-time="54" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
@@ -436,8 +436,8 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="30:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;30:14:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-2" call-id="20" rc-code="7" op-status="0" interval="0" last-run="1500022209" last-rc-change="1500022209" exec-time="83" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="15:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;15:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-2" call-id="25" rc-code="0" op-status="0" interval="0" last-run="1500022216" last-rc-change="1500022216" exec-time="825" queue-time="0" op-digest="898a907c413e600aa5c030c26fbdccfd"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="16:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;16:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-2" call-id="26" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022217" exec-time="125" queue-time="0" op-digest="f30bc9d35a6373a2e10bc481ae6aaf8d"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="15:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;15:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-2" call-id="25" rc-code="0" op-status="0" interval="0" last-run="1500022216" last-rc-change="1500022216" exec-time="825" queue-time="0" op-digest="0e859e53e780b236b7edb6b7a399e031"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="16:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:0;16:17:0:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-2" call-id="26" rc-code="0" op-status="0" interval="60000" last-rc-change="1500022217" exec-time="125" queue-time="0" op-digest="57d17ff3d69c0f58c3556fd7f904ec61"/>
           </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="32:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" transition-magic="0:7;32:18:7:db0fd259-f51a-4ee6-a59b-6043dedaded8" on_node="overcloud-controller-2" call-id="30" rc-code="7" op-status="0" interval="0" last-run="1500022219" last-rc-change="1500022219" exec-time="42" queue-time="0" op-digest="92b621d0e4ece2bf96924b0f75ab6f90"/>
diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot
index cff477b..a7e5805 100644
--- a/pengine/test10/bundle-order-fencing.dot
+++ b/pengine/test10/bundle-order-fencing.dot
@@ -7,10 +7,8 @@ digraph "g" {
 "all_stopped" -> "stonith-fence_ipmilan-5254003e8e97_start_0 controller-1" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "galera-bundle-0_monitor_0 controller-1" -> "galera-bundle-0_start_0 controller-2" [ style = dashed]
-"galera-bundle-0_monitor_0 controller-1" -> "galera-bundle-0_stop_0 controller-0" [ style = bold]
 "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" -> "galera-bundle-0_stop_0 controller-0" [ style = bold]
 "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]
@@ -103,10 +101,8 @@ digraph "g" {
 "ip-192.168.24.7_stop_0 controller-0" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold]
 "ip-192.168.24.7_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"]
 "rabbitmq-bundle-0_monitor_0 controller-1" -> "rabbitmq-bundle-0_start_0 controller-1" [ style = dashed]
-"rabbitmq-bundle-0_monitor_0 controller-1" -> "rabbitmq-bundle-0_stop_0 controller-0" [ style = bold]
 "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" -> "rabbitmq-bundle-0_stop_0 controller-0" [ style = bold]
 "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]
@@ -206,10 +202,8 @@ digraph "g" {
 "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed]
 "rabbitmq_stop_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="orange"]
 "redis-bundle-0_monitor_0 controller-1" -> "redis-bundle-0_start_0 controller-1" [ style = dashed]
-"redis-bundle-0_monitor_0 controller-1" -> "redis-bundle-0_stop_0 controller-0" [ style = bold]
 "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" -> "redis-bundle-0_stop_0 controller-0" [ style = bold]
 "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]
diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
index c32e834..8e35f32 100644
--- a/pengine/test10/bundle-order-fencing.exp
+++ b/pengine/test10/bundle-order-fencing.exp
@@ -361,7 +361,7 @@
   <synapse id="24">
     <action_set>
       <pseudo_event id="42" operation="stop" operation_key="rabbitmq-bundle-docker-0_stop_0">
-        <attributes CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-rabbitmq-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3122 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-rabbitmq-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3122 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -386,12 +386,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="30" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="36" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
@@ -559,7 +553,7 @@
   <synapse id="38">
     <action_set>
       <pseudo_event id="77" operation="stop" operation_key="galera-bundle-docker-0_stop_0">
-        <attributes 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 --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 "/>
+        <attributes 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 "/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -584,12 +578,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="32" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="38" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="40">
@@ -1419,7 +1407,7 @@
   <synapse id="95">
     <action_set>
       <pseudo_event id="118" operation="stop" operation_key="redis-bundle-docker-0_stop_0">
-        <attributes 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-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes 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-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=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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -1444,12 +1432,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="34" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="40" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="97">
@@ -1623,7 +1605,7 @@
   <synapse id="110">
     <action_set>
       <pseudo_event id="188" operation="stop" operation_key="haproxy-bundle-docker-0_stop_0">
-        <attributes 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 --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 "/>
+        <attributes 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 "/>
       </pseudo_event>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-fencing.xml b/pengine/test10/bundle-order-fencing.xml
index 96eba09..ac88e14 100644
--- a/pengine/test10/bundle-order-fencing.xml
+++ b/pengine/test10/bundle-order-fencing.xml
@@ -419,8 +419,8 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="31:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:7;31:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="9" rc-code="7" op-status="0" interval="0" last-run="1505142205" last-rc-change="1505142205" exec-time="7679" queue-time="0" op-digest="bf832eda4aa91b107d859f72dc02f785"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="60:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;60:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="95" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="5624" queue-time="0" op-digest="02e256cb260a33abb41a6f678e960c8b"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="47:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;47:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="103" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142219" exec-time="718" queue-time="0" op-digest="280bc1673f3a1ad80b6af712a34ace18"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="60:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;60:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="95" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="5624" queue-time="0" op-digest="7f41de83a371741e06e17d6c96a008a7"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="47:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;47:1898:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="103" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142219" exec-time="718" queue-time="0" op-digest="5319266a2fe53465b1122352efb6aa5c"/>
           </lrm_resource>
           <lrm_resource id="ip-172.17.1.19" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-172.17.1.19_last_0" operation_key="ip-172.17.1.19_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="188:2:0:6cc81ba4-720a-4e73-9f86-78ca5873faac" transition-magic="0:0;188:2:0:6cc81ba4-720a-4e73-9f86-78ca5873faac" on_node="controller-2" call-id="105" rc-code="0" op-status="0" interval="0" last-run="1505209227" last-rc-change="1505209227" exec-time="4109" queue-time="1" op-digest="2c46df7582fe8b55e9dcdeaceb4c84c7"/>
@@ -437,8 +437,8 @@
             <lrm_rsc_op id="ip-172.17.3.19_monitor_10000" operation_key="ip-172.17.3.19_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="187:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;187:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="93" rc-code="0" op-status="0" interval="10000" last-rc-change="1505142211" exec-time="270" queue-time="0" op-digest="189813e5c19cd2c64fc44fae8b66c73e"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="94:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;94:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="94" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="5145" queue-time="0" op-digest="ffa0e7e58a814e30f643809f18362c28"/>
-            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="95:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;95:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="101" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142218" exec-time="611" queue-time="0" op-digest="38c90497a59d296d417bfe41202413f0"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="94:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;94:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="94" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="5145" queue-time="0" op-digest="b338eb1889737523521461347b98b88a"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="95:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;95:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="101" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142218" exec-time="611" queue-time="0" op-digest="d69e833791e20b938e2c63f2e2e57ed2"/>
           </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="build_active_RAs" crm_feature_set="3.0.12" transition-key="34:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:7;34:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="21" rc-code="7" op-status="0" interval="0" last-run="1505142205" last-rc-change="1505142205" exec-time="7662" queue-time="0" op-digest="90b7b2b5826b874d7be1cb44875d1ef5"/>
@@ -448,11 +448,11 @@
             <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_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="29c58e541af90f274b1d822e91d3f2f1"/>
+            <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"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="192:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;192:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="96" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="3546" queue-time="0" op-digest="29c58e541af90f274b1d822e91d3f2f1"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-1_monitor_60000" operation_key="haproxy-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="193:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;193:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="98" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142217" exec-time="1337" queue-time="0" op-digest="4b2db678b64bf44c2e087203a776559e"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="192:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;192:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="96" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="3546" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-1_monitor_60000" operation_key="haproxy-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="193:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;193:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="98" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142217" exec-time="1337" queue-time="0" op-digest="02bacde98cfd7c1daceaf2a3bb4f851c"/>
           </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="build_active_RAs" crm_feature_set="3.0.12" transition-key="36:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:7;36:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="29" rc-code="7" op-status="0" interval="0" last-run="1505142205" last-rc-change="1505142205" exec-time="7658" queue-time="0" op-digest="f6f1f5d0cf4620d4bedb1c8326252d6e"/>
@@ -461,8 +461,8 @@
             <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="37:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:7;37:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="33" rc-code="7" op-status="0" interval="0" last-run="1505142205" last-rc-change="1505142205" exec-time="7628" queue-time="0" op-digest="c15ee65856a09285286dcaf670b8efbe"/>
           </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_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="135:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;135:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="97" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="4562" queue-time="0" op-digest="461f51d57aca8c8e770d6738eecfbe98"/>
-            <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="136:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;136:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="99" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142218" exec-time="760" queue-time="0" op-digest="8b68c463f54cacaf85ec2b81bd36c2fa"/>
+            <lrm_rsc_op id="redis-bundle-docker-2_last_0" operation_key="redis-bundle-docker-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="135:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;135:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="97" rc-code="0" op-status="0" interval="0" last-run="1505142213" last-rc-change="1505142213" exec-time="4562" queue-time="0" op-digest="cdf5d52dbfd265e497dd1dfb06f2faf1"/>
+            <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="136:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:0;136:1897:0:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="99" rc-code="0" op-status="0" interval="60000" last-rc-change="1505142218" exec-time="760" queue-time="0" op-digest="4482b2a3082df72156f22666721ee018"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="47:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" transition-magic="0:7;47:1897:7:5030f43e-a349-47db-a369-6cf7555e61d3" on_node="controller-2" call-id="73" rc-code="7" op-status="0" interval="0" last-run="1505142205" last-rc-change="1505142205" exec-time="7557" queue-time="0" op-digest="29c58e541af90f274b1d822e91d3f2f1"/>
@@ -544,20 +544,20 @@
             <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="36:20:7:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:7;36:20:7:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="17" rc-code="7" op-status="0" interval="0" last-run="1505211876" last-rc-change="1505211876" exec-time="7268" queue-time="0" op-digest="c4193f3afb494a6a0ebfd33f930e7be4"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="132:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;132:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="90" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="4543" queue-time="0" op-digest="175ea4133e50b9af4cc1cfbd18abebff"/>
-            <lrm_rsc_op id="redis-bundle-docker-1_monitor_60000" operation_key="redis-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="133:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;133:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="97" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211888" exec-time="487" queue-time="0" op-digest="765fbf3349b835cc875c5325b30d0fd3"/>
+            <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="132:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;132:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="90" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="4543" queue-time="0" op-digest="d12a03fcf5794843261e2916fbd6c63b"/>
+            <lrm_rsc_op id="redis-bundle-docker-1_monitor_60000" operation_key="redis-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="133:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;133:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="97" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211888" exec-time="487" queue-time="0" op-digest="42c7c6491371a6562c49d1c32399082b"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="59:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;59:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="91" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="3530" queue-time="0" op-digest="36b96445adb20bcfaf934ad1b10f43c0"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="60:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;60:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="94" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211887" exec-time="727" queue-time="0" op-digest="4d3fcd585bc6bc1ca5cb02d83950ddd7"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="59:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;59:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="91" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="3530" queue-time="0" op-digest="b59f3520d7d5f770ece284f4ab68291b"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="60:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;60:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="94" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211887" exec-time="727" queue-time="0" op-digest="f8c3faf3117dbe6901f69d517a8a7f78"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="197:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;197:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="92" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="4385" queue-time="0" op-digest="29c58e541af90f274b1d822e91d3f2f1"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="198:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;198:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="96" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211888" exec-time="433" queue-time="0" op-digest="4b2db678b64bf44c2e087203a776559e"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="197:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;197:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="92" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="4385" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="198:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;198:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="96" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211888" exec-time="433" queue-time="0" op-digest="02bacde98cfd7c1daceaf2a3bb4f851c"/>
           </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="93:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;93:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="93" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="4402" queue-time="0" op-digest="60a63e9d6611be7ce84c9b773317acbb"/>
-            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="94:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;94:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="99" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211888" exec-time="396" queue-time="0" op-digest="93685b5604fdc2532454baf2019626fa"/>
+            <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="93:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;93:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="93" rc-code="0" op-status="0" interval="0" last-run="1505211884" last-rc-change="1505211884" exec-time="4402" queue-time="0" op-digest="14385e7ff7b4fcd7e4d11755b3ad0c94"/>
+            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="94:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" transition-magic="0:0;94:20:0:5d83e3c7-3fae-4ec0-b903-5c8f7b5c42ae" on_node="controller-1" call-id="99" rc-code="0" op-status="0" interval="60000" last-rc-change="1505211888" exec-time="396" queue-time="0" op-digest="59fb532a17dc4de0d7c6984a4a9fbce7"/>
           </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"/>
diff --git a/pengine/test10/bundle-order-partial-start-2.exp b/pengine/test10/bundle-order-partial-start-2.exp
index cea15dd..afba801 100644
--- a/pengine/test10/bundle-order-partial-start-2.exp
+++ b/pengine/test10/bundle-order-partial-start-2.exp
@@ -231,7 +231,7 @@
     <action_set>
       <rsc_op id="41" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -247,7 +247,7 @@
     <action_set>
       <rsc_op id="40" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -263,7 +263,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <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="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -452,7 +452,7 @@
     <action_set>
       <rsc_op id="116" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -465,7 +465,7 @@
     <action_set>
       <rsc_op id="115" operation="start" operation_key="haproxy-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -481,7 +481,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
diff --git a/pengine/test10/bundle-order-partial-start-2.xml b/pengine/test10/bundle-order-partial-start-2.xml
index 26fccf0..6dfa711 100644
--- a/pengine/test10/bundle-order-partial-start-2.xml
+++ b/pengine/test10/bundle-order-partial-start-2.xml
@@ -307,24 +307,24 @@
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="10" rc-code="0" op-status="0" interval="0" last-run="1496303575" last-rc-change="1496303575" exec-time="850" queue-time="0" op-digest="1ef5258917c1ede92b7814bfe6a32a5a"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="11" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303576" exec-time="76" queue-time="0" op-digest="586be2ae8d7a4941912d2a42f11f991d"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="10" rc-code="0" op-status="0" interval="0" last-run="1496303575" last-rc-change="1496303575" exec-time="850" queue-time="0" op-digest="9d5e401cce0874816028f0e6f2f99fdd"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="11" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303576" exec-time="76" queue-time="0" op-digest="8712259bfb9d55ff9fbff5f39e5d8a30"/>
           </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_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="50cce6e3abf7894ffd01b9a4021482b8"/>
-            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="17:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;17:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="18" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303596" exec-time="70" queue-time="0" op-digest="249ca06c3daa0b28b190b0fcf20dbeb0"/>
+            <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"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="17:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;17:8:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="18" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303596" exec-time="70" queue-time="0" op-digest="65788bd6ff81ed3cb6552df07faacd51"/>
           </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_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="d9a0fecf7d4c4aaf69665baf365326a6"/>
-            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="29" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303664" exec-time="74" queue-time="0" op-digest="53dc80266361c5e7e6a1a3d7cc77b1cd"/>
+            <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"/>
+            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="29" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303664" exec-time="74" queue-time="0" op-digest="646f8db9f7baea61a60753b5ae8b9987"/>
           </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"/>
@@ -355,9 +355,9 @@
             <lrm_rsc_op id="ip-192.168.122.248_monitor_10000" operation_key="ip-192.168.122.248_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="69:36:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;69:36:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="66" rc-code="0" op-status="0" interval="10000" last-rc-change="1496303750" exec-time="30" queue-time="0" op-digest="2182cf0cd059930b67d43545b4950c6f"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="161" rc-code="0" op-status="0" interval="0" last-run="1496305247" last-rc-change="1496305247" exec-time="838" queue-time="0" op-digest="3aa35269c96594499406635b536dcf19"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="161" rc-code="0" op-status="0" interval="0" last-run="1496305247" last-rc-change="1496305247" exec-time="838" queue-time="0" op-digest="6bca2ea371d88385f9492e607d2ba781"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/bundle-order-partial-start.exp b/pengine/test10/bundle-order-partial-start.exp
index d21193a..cb10bad 100644
--- a/pengine/test10/bundle-order-partial-start.exp
+++ b/pengine/test10/bundle-order-partial-start.exp
@@ -218,7 +218,7 @@
     <action_set>
       <rsc_op id="40" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <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="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -231,7 +231,7 @@
     <action_set>
       <rsc_op id="39" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -247,7 +247,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -433,7 +433,7 @@
     <action_set>
       <rsc_op id="115" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -446,7 +446,7 @@
     <action_set>
       <rsc_op id="114" operation="start" operation_key="haproxy-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -462,7 +462,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
diff --git a/pengine/test10/bundle-order-partial-start.xml b/pengine/test10/bundle-order-partial-start.xml
index 9b28b0d..8a5efdb 100644
--- a/pengine/test10/bundle-order-partial-start.xml
+++ b/pengine/test10/bundle-order-partial-start.xml
@@ -307,16 +307,16 @@
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="10" rc-code="0" op-status="0" interval="0" last-run="1496303575" last-rc-change="1496303575" exec-time="850" queue-time="0" op-digest="1ef5258917c1ede92b7814bfe6a32a5a"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="11" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303576" exec-time="76" queue-time="0" op-digest="586be2ae8d7a4941912d2a42f11f991d"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;2:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="10" rc-code="0" op-status="0" interval="0" last-run="1496303575" last-rc-change="1496303575" exec-time="850" queue-time="0" op-digest="9d5e401cce0874816028f0e6f2f99fdd"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;3:6:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="11" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303576" exec-time="76" queue-time="0" op-digest="8712259bfb9d55ff9fbff5f39e5d8a30"/>
           </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_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="d9a0fecf7d4c4aaf69665baf365326a6"/>
-            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="29" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303664" exec-time="74" queue-time="0" op-digest="53dc80266361c5e7e6a1a3d7cc77b1cd"/>
+            <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"/>
+            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;35:15:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="29" rc-code="0" op-status="0" interval="60000" last-rc-change="1496303664" exec-time="74" queue-time="0" op-digest="646f8db9f7baea61a60753b5ae8b9987"/>
           </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"/>
@@ -347,9 +347,9 @@
             <lrm_rsc_op id="ip-192.168.122.248_monitor_10000" operation_key="ip-192.168.122.248_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="69:36:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;69:36:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="66" rc-code="0" op-status="0" interval="10000" last-rc-change="1496303750" exec-time="30" queue-time="0" op-digest="2182cf0cd059930b67d43545b4950c6f"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="161" rc-code="0" op-status="0" interval="0" last-run="1496305247" last-rc-change="1496305247" exec-time="838" queue-time="0" op-digest="3aa35269c96594499406635b536dcf19"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="161" rc-code="0" op-status="0" interval="0" last-run="1496305247" last-rc-change="1496305247" exec-time="838" queue-time="0" op-digest="6bca2ea371d88385f9492e607d2ba781"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/bundle-order-partial-stop.exp b/pengine/test10/bundle-order-partial-stop.exp
index f73a046..6119950 100644
--- a/pengine/test10/bundle-order-partial-stop.exp
+++ b/pengine/test10/bundle-order-partial-stop.exp
@@ -112,7 +112,7 @@
     <action_set>
       <rsc_op id="19" operation="stop" operation_key="rabbitmq-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -245,7 +245,7 @@
     <action_set>
       <rsc_op id="39" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -533,7 +533,7 @@
     <action_set>
       <rsc_op id="62" operation="stop" operation_key="redis-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -646,7 +646,7 @@
     <action_set>
       <rsc_op id="107" operation="stop" operation_key="haproxy-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -659,7 +659,7 @@
     <action_set>
       <rsc_op id="112" operation="stop" operation_key="openstack-cinder-volume-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="openstack-cinder-volume-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" 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/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-partial-stop.xml b/pengine/test10/bundle-order-partial-stop.xml
index 467082a..e5fba3e 100644
--- a/pengine/test10/bundle-order-partial-stop.xml
+++ b/pengine/test10/bundle-order-partial-stop.xml
@@ -359,8 +359,8 @@
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="161" rc-code="0" op-status="0" interval="0" last-run="1496305247" last-rc-change="1496305247" exec-time="838" queue-time="0" op-digest="3aa35269c96594499406635b536dcf19"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/bundle-order-startup-clone-2.exp b/pengine/test10/bundle-order-startup-clone-2.exp
index 0ffa79b..22bfa37 100644
--- a/pengine/test10/bundle-order-startup-clone-2.exp
+++ b/pengine/test10/bundle-order-startup-clone-2.exp
@@ -479,7 +479,7 @@
     <action_set>
       <rsc_op id="69" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="metal-1" on_node_uuid="1">
         <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="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -492,7 +492,7 @@
     <action_set>
       <rsc_op id="68" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -520,7 +520,7 @@
     <action_set>
       <rsc_op id="35" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -529,7 +529,7 @@
     <action_set>
       <rsc_op id="19" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -538,7 +538,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -621,7 +621,7 @@
     <action_set>
       <rsc_op id="73" operation="monitor" operation_key="galera-bundle-docker-1_monitor_60000" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-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=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -634,7 +634,7 @@
     <action_set>
       <rsc_op id="72" operation="start" operation_key="galera-bundle-docker-1_start_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-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=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -662,7 +662,7 @@
     <action_set>
       <rsc_op id="37" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-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=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -671,7 +671,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-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=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -680,7 +680,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-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=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/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 /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/galera-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -763,7 +763,7 @@
     <action_set>
       <rsc_op id="77" operation="monitor" operation_key="galera-bundle-docker-2_monitor_60000" on_node="metal-3" on_node_uuid="3">
         <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="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -776,7 +776,7 @@
     <action_set>
       <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -804,7 +804,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -813,7 +813,7 @@
     <action_set>
       <rsc_op id="23" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -822,7 +822,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -905,7 +905,7 @@
     <action_set>
       <rsc_op id="106" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_60000" on_node="metal-1" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -918,7 +918,7 @@
     <action_set>
       <rsc_op id="105" operation="start" operation_key="haproxy-bundle-docker-0_start_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -946,7 +946,7 @@
     <action_set>
       <rsc_op id="41" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -955,7 +955,7 @@
     <action_set>
       <rsc_op id="25" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -964,7 +964,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -973,7 +973,7 @@
     <action_set>
       <rsc_op id="108" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_60000" on_node="metal-2" 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="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -986,7 +986,7 @@
     <action_set>
       <rsc_op id="107" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -1014,7 +1014,7 @@
     <action_set>
       <rsc_op id="42" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -1023,7 +1023,7 @@
     <action_set>
       <rsc_op id="26" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -1032,7 +1032,7 @@
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -1041,7 +1041,7 @@
     <action_set>
       <rsc_op id="110" operation="monitor" operation_key="haproxy-bundle-docker-2_monitor_60000" on_node="metal-3" on_node_uuid="3">
         <primitive id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -1054,7 +1054,7 @@
     <action_set>
       <rsc_op id="109" operation="start" operation_key="haproxy-bundle-docker-2_start_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -1082,7 +1082,7 @@
     <action_set>
       <rsc_op id="43" operation="monitor" operation_key="haproxy-bundle-docker-2_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -1091,7 +1091,7 @@
     <action_set>
       <rsc_op id="27" operation="monitor" operation_key="haproxy-bundle-docker-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -1100,7 +1100,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="haproxy-bundle-docker-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -1660,7 +1660,7 @@
     <action_set>
       <rsc_op id="116" operation="monitor" operation_key="redis-bundle-docker-0_monitor_60000" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1673,7 +1673,7 @@
     <action_set>
       <rsc_op id="115" operation="start" operation_key="redis-bundle-docker-0_start_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1701,7 +1701,7 @@
     <action_set>
       <rsc_op id="44" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1710,7 +1710,7 @@
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1719,7 +1719,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1802,7 +1802,7 @@
     <action_set>
       <rsc_op id="120" operation="monitor" operation_key="redis-bundle-docker-1_monitor_60000" on_node="metal-2" 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="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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 --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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>
@@ -1815,7 +1815,7 @@
     <action_set>
       <rsc_op id="119" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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 --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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>
@@ -1843,7 +1843,7 @@
     <action_set>
       <rsc_op id="46" operation="monitor" operation_key="redis-bundle-docker-1_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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 --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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 "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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/>
@@ -1852,7 +1852,7 @@
     <action_set>
       <rsc_op id="30" operation="monitor" operation_key="redis-bundle-docker-1_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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 --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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/>
@@ -1861,7 +1861,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="redis-bundle-docker-1_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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 --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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 "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" 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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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/>
@@ -1944,7 +1944,7 @@
     <action_set>
       <rsc_op id="124" operation="monitor" operation_key="redis-bundle-docker-2_monitor_60000" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1957,7 +1957,7 @@
     <action_set>
       <rsc_op id="123" operation="start" operation_key="redis-bundle-docker-2_start_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1985,7 +1985,7 @@
     <action_set>
       <rsc_op id="48" operation="monitor" operation_key="redis-bundle-docker-2_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1994,7 +1994,7 @@
     <action_set>
       <rsc_op id="32" operation="monitor" operation_key="redis-bundle-docker-2_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -2003,7 +2003,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="redis-bundle-docker-2_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bundle-order-startup-clone.exp b/pengine/test10/bundle-order-startup-clone.exp
index f4d61ee..42ee902 100644
--- a/pengine/test10/bundle-order-startup-clone.exp
+++ b/pengine/test10/bundle-order-startup-clone.exp
@@ -30,7 +30,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -39,7 +39,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -48,7 +48,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="62" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_60000" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -70,7 +70,7 @@
     <action_set>
       <rsc_op id="61" operation="start" operation_key="haproxy-bundle-docker-0_start_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -92,7 +92,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -101,7 +101,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -110,7 +110,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -278,7 +278,7 @@
     <action_set>
       <rsc_op id="68" operation="monitor" operation_key="redis-bundle-docker-0_monitor_60000" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -291,7 +291,7 @@
     <action_set>
       <rsc_op id="67" operation="start" operation_key="redis-bundle-docker-0_start_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -313,7 +313,7 @@
     <action_set>
       <rsc_op id="18" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="metal-3" on_node_uuid="3">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -322,7 +322,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="metal-2" on_node_uuid="2">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -331,7 +331,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bundle-order-startup.exp b/pengine/test10/bundle-order-startup.exp
index c025a41..1f83781 100644
--- a/pengine/test10/bundle-order-startup.exp
+++ b/pengine/test10/bundle-order-startup.exp
@@ -137,7 +137,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="rabbitmq-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -150,7 +150,7 @@
     <action_set>
       <rsc_op id="16" operation="start" operation_key="rabbitmq-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -166,7 +166,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rabbitmq-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -298,7 +298,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <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="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -311,7 +311,7 @@
     <action_set>
       <rsc_op id="38" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -327,7 +327,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -531,7 +531,7 @@
     <action_set>
       <rsc_op id="62" operation="monitor" operation_key="redis-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -544,7 +544,7 @@
     <action_set>
       <rsc_op id="61" operation="start" operation_key="redis-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -560,7 +560,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="redis-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -821,7 +821,7 @@
     <action_set>
       <rsc_op id="113" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -834,7 +834,7 @@
     <action_set>
       <rsc_op id="112" operation="start" operation_key="haproxy-bundle-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -850,7 +850,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="haproxy-bundle-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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/>
@@ -859,7 +859,7 @@
     <action_set>
       <rsc_op id="119" operation="monitor" operation_key="openstack-cinder-volume-docker-0_monitor_60000" on_node="undercloud" on_node_uuid="1">
         <primitive id="openstack-cinder-volume-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" 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/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -872,7 +872,7 @@
     <action_set>
       <rsc_op id="118" operation="start" operation_key="openstack-cinder-volume-docker-0_start_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="openstack-cinder-volume-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" 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/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -888,7 +888,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="openstack-cinder-volume-docker-0_monitor_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="openstack-cinder-volume-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" 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/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bundle-order-stop-clone.dot b/pengine/test10/bundle-order-stop-clone.dot
index 4d03564..48bb614 100644
--- a/pengine/test10/bundle-order-stop-clone.dot
+++ b/pengine/test10/bundle-order-stop-clone.dot
@@ -1,10 +1,8 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "galera-bundle-0_monitor_0 metal-2" -> "galera-bundle-0_start_0 metal-1" [ style = dashed]
-"galera-bundle-0_monitor_0 metal-2" -> "galera-bundle-0_stop_0 metal-1" [ style = bold]
 "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" -> "galera-bundle-0_stop_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=dashed color="red" fontcolor="black"]
 "galera-bundle-0_start_0 metal-1" -> "galera-bundle-0_monitor_60000 metal-1" [ style = dashed]
diff --git a/pengine/test10/bundle-order-stop-clone.exp b/pengine/test10/bundle-order-stop-clone.exp
index 92ca6de..3e3fe77 100644
--- a/pengine/test10/bundle-order-stop-clone.exp
+++ b/pengine/test10/bundle-order-stop-clone.exp
@@ -243,7 +243,7 @@
     <action_set>
       <rsc_op id="58" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="metal-1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -267,12 +267,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="33" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="37" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="metal-3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
         <rsc_op id="74" operation="stop" operation_key="galera:0_stop_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="metal-1"/>
       </trigger>
     </inputs>
diff --git a/pengine/test10/bundle-order-stop-clone.xml b/pengine/test10/bundle-order-stop-clone.xml
index 87ed212..720517f 100644
--- a/pengine/test10/bundle-order-stop-clone.xml
+++ b/pengine/test10/bundle-order-stop-clone.xml
@@ -193,8 +193,8 @@
             <lrm_rsc_op id="storage_monitor_30000" operation_key="storage_monitor_30000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="4:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;4:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="4" rc-code="0" op-status="0" interval="30000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="5fdd98b808a9cd8496a49fc679446175"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50cce6e3abf7894ffd01b9a4021482b8"/>
-            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="249ca06c3daa0b28b190b0fcf20dbeb0"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="a25a3351a7fd1a430a6a8991da64de98"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="65788bd6ff81ed3cb6552df07faacd51"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="810c6ca70f61efcf84f03ce4ebf1583e"/>
@@ -203,8 +203,8 @@
             <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="d382f6658eb81d66313704072c2d9704"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-0_monitor_60000" operation_key="haproxy-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="8e98096b4e2923c7be3ce5fa2646c524"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-0_monitor_60000" operation_key="haproxy-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="6560898bb4a594e45af727baab2e600d"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
@@ -213,8 +213,8 @@
             <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="d9a0fecf7d4c4aaf69665baf365326a6"/>
-            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="53dc80266361c5e7e6a1a3d7cc77b1cd"/>
+            <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="b26392b2cfc73ee1c83c6bb1ec2aa4c7"/>
+            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="646f8db9f7baea61a60753b5ae8b9987"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="029dcdb8e6d039453207529ddf76e626"/>
@@ -245,18 +245,18 @@
             <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="ed3aad657e7994e60ac4dbd3a200b0b7"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="73b5463e899c27755cf6c0e1573fee0a"/>
-            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="5b068abf556a53f4dc4ddbc5309805c7"/>
+            <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="9be25018e115be06a50f1d7fdb69cb66"/>
+            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="486cc657e64e3e5abaca075a67dd7fc9"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="d382f6658eb81d66313704072c2d9704"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-1_monitor_60000" operation_key="haproxy-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="8e98096b4e2923c7be3ce5fa2646c524"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-1_monitor_60000" operation_key="haproxy-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="6560898bb4a594e45af727baab2e600d"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
@@ -265,8 +265,8 @@
             <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="90ccdc75136c9ebfb1985f14df781477"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="b7d3010f6ffa7fbf0d5d35fdd98f3a8e"/>
-            <lrm_rsc_op id="redis-bundle-docker-1_monitor_60000" operation_key="redis-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="f56b8a16be3a64834ccb8b159e9f99c4"/>
+            <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="7cb97c89c7e1150856aeab87eff14450"/>
+            <lrm_rsc_op id="redis-bundle-docker-1_monitor_60000" operation_key="redis-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="e76c2e8a26aabe056305ab7b9972c322"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="redis-bundle-docker-2_last_0" operation_key="redis-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="78dfacba4be0b97e9a6426b342bb2fdd"/>
@@ -297,8 +297,8 @@
             <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="810c6ca70f61efcf84f03ce4ebf1583e"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="4a10b0bafda85bb1b0db4b969a2fd6e0"/>
-            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="e4ffbb211cf0ba3edd20df1e4f2b7855"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="6c2f81de1714e10eacba6279afe5e059"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="fd04e5bc4ae1f504b2653c4326ef8132"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
@@ -307,8 +307,8 @@
             <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-2" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="8e98096b4e2923c7be3ce5fa2646c524"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="6560898bb4a594e45af727baab2e600d"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker">
             <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="90ccdc75136c9ebfb1985f14df781477"/>
@@ -317,8 +317,8 @@
             <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="029dcdb8e6d039453207529ddf76e626"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-2" class="ocf" provider="heartbeat" type="docker">
-            <lrm_rsc_op id="redis-bundle-docker-2_last_0" operation_key="redis-bundle-docker-2_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="b5e9788be69d5833dea37ab62a7ecff3"/>
-            <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="30fb9b127cc681dc85f77c071f7148fa"/>
+            <lrm_rsc_op id="redis-bundle-docker-2_last_0" operation_key="redis-bundle-docker-2_start_0" operation="start" 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="0" last-run="1498103792" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="8c6035dc510b3d42f7ebc22c2a3a445c"/>
+            <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;3:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="3" rc-code="0" op-status="0" interval="60000" last-rc-change="1498103792" exec-time="0" queue-time="0" op-digest="95e57f57b6c5a4bb2e252d22d70f01df"/>
           </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"/>
diff --git a/pengine/test10/bundle-order-stop.exp b/pengine/test10/bundle-order-stop.exp
index f73a046..6119950 100644
--- a/pengine/test10/bundle-order-stop.exp
+++ b/pengine/test10/bundle-order-stop.exp
@@ -112,7 +112,7 @@
     <action_set>
       <rsc_op id="19" operation="stop" operation_key="rabbitmq-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="rabbitmq-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-rabbitmq:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/rabbitmq-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=3121 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq: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/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -245,7 +245,7 @@
     <action_set>
       <rsc_op id="39" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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 --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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-mariadb:latest" 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/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 /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/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -533,7 +533,7 @@
     <action_set>
       <rsc_op id="62" operation="stop" operation_key="redis-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="redis-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-redis:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-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=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/redis/etc/redis:/etc/redis:ro -v /var/lib/config-data/redis/etc/redis.conf:/etc/redis.conf:ro -v /var/lib/config-data/redis/etc/redis.conf.puppet:/etc/redis.conf.puppet:ro -v /var/lib/config-data/redis/etc/redis-sentinel.conf:/etc/redis-sentinel.conf: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-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -646,7 +646,7 @@
     <action_set>
       <rsc_op id="107" operation="stop" operation_key="haproxy-bundle-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="haproxy-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --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/haproxy/etc:/etc: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 "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-haproxy:latest" 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/haproxy/etc:/etc: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>
@@ -659,7 +659,7 @@
     <action_set>
       <rsc_op id="112" operation="stop" operation_key="openstack-cinder-volume-docker-0_stop_0" on_node="undercloud" on_node_uuid="1">
         <primitive id="openstack-cinder-volume-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
+        <attributes CRM_meta_on_node="undercloud" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/tripleoupstream/centos-binary-cinder-volume:latest" 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/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/cinder/etc/cinder:/etc/cinder:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /dev:/dev:rw -v /run:/run:rw -v /sys:/sys:rw -v /lib/modules:/lib/modules:ro -v /etc/iscsi:/etc/iscsi:rw -v /var/lib/cinder:/var/lib/cinder:rw -v /var/log/containers/cinder:/var/log/cinder:rw --ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-stop.xml b/pengine/test10/bundle-order-stop.xml
index 467082a..e5fba3e 100644
--- a/pengine/test10/bundle-order-stop.xml
+++ b/pengine/test10/bundle-order-stop.xml
@@ -359,8 +359,8 @@
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;76:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="161" rc-code="0" op-status="0" interval="0" last-run="1496305247" last-rc-change="1496305247" exec-time="838" queue-time="0" op-digest="3aa35269c96594499406635b536dcf19"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:0;14:93:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="162" rc-code="0" op-status="0" interval="60000" last-rc-change="1496305248" exec-time="63" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_failure_0" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" transition-magic="0:7;14:91:0:14f1d42b-7a22-4dc5-987e-d4fc94449aea" on_node="undercloud" call-id="158" rc-code="7" op-status="0" interval="60000" last-rc-change="1496305247" exec-time="0" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/bundle-probe-order-1.exp b/pengine/test10/bundle-probe-order-1.exp
index e70680b..e5f2a9b 100644
--- a/pengine/test10/bundle-probe-order-1.exp
+++ b/pengine/test10/bundle-probe-order-1.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="centos3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
       <rsc_op id="1" operation="monitor" operation_key="galera-bundle-docker-0_monitor_0" on_node="centos1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -30,7 +30,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -39,7 +39,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -48,7 +48,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -66,7 +66,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -75,7 +75,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bundle-probe-order-2.dot b/pengine/test10/bundle-probe-order-2.dot
index 4fba741..80f6c3a 100644
--- a/pengine/test10/bundle-probe-order-2.dot
+++ b/pengine/test10/bundle-probe-order-2.dot
@@ -1,6 +1,5 @@
 digraph "g" {
 "galera-bundle-0_monitor_60000 centos2" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-docker-0_monitor_60000 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"]
diff --git a/pengine/test10/bundle-probe-order-2.exp b/pengine/test10/bundle-probe-order-2.exp
index f33da4d..0477c87 100644
--- a/pengine/test10/bundle-probe-order-2.exp
+++ b/pengine/test10/bundle-probe-order-2.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="galera:0_monitor_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="centos2">
+      <rsc_op id="12" operation="monitor" operation_key="galera:0_monitor_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="centos2">
         <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_notify="false" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_op_target_rc="7" CRM_meta_physical_host="centos2" CRM_meta_timeout="30000" cluster_host_map="centos1:centos1;centos2:centos2;centos3:centos3"  enable_creation="true" wsrep_cluster_address="gcomm://centos1,centos2,centos3"/>
       </rsc_op>
@@ -10,54 +10,45 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="centos2" on_node_uuid="2">
-        <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="centos2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="2">
-    <action_set>
-      <rsc_op id="16" 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_60000" 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"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="3">
+  <synapse id="2">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos2" on_node_uuid="2">
+      <rsc_op id="5" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="4">
+  <synapse id="3">
     <action_set>
-      <rsc_op id="8" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos3" on_node_uuid="3">
+      <rsc_op id="10" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="5">
+  <synapse id="4">
     <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos2" on_node_uuid="2">
+      <rsc_op id="7" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="6">
+  <synapse id="5">
     <action_set>
-      <rsc_op id="1" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos1" on_node_uuid="1">
+      <rsc_op id="3" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bundle-probe-order-2.summary b/pengine/test10/bundle-probe-order-2.summary
index e094e26..2bf58db 100644
--- a/pengine/test10/bundle-probe-order-2.summary
+++ b/pengine/test10/bundle-probe-order-2.summary
@@ -13,7 +13,6 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: galera:0        monitor on galera-bundle-0
- * Resource action: galera-bundle-docker-0 monitor=60000 on centos2
  * Resource action: galera-bundle-0 monitor=60000 on centos2
  * Resource action: galera-bundle-docker-1 monitor on centos2
  * Resource action: galera-bundle-docker-2 monitor on centos3
diff --git a/pengine/test10/bundle-probe-order-3.dot b/pengine/test10/bundle-probe-order-3.dot
index 4dc54b5..daff1dc 100644
--- a/pengine/test10/bundle-probe-order-3.dot
+++ b/pengine/test10/bundle-probe-order-3.dot
@@ -2,7 +2,6 @@ digraph "g" {
 "galera-bundle-0_monitor_0 centos1" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-0_monitor_0 centos2" [ style=bold color="green" fontcolor="black"]
 "galera-bundle-0_monitor_0 centos3" [ style=bold color="green" fontcolor="black"]
-"galera-bundle-docker-0_monitor_60000 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"]
diff --git a/pengine/test10/bundle-probe-order-3.exp b/pengine/test10/bundle-probe-order-3.exp
index e93434b..395753e 100644
--- a/pengine/test10/bundle-probe-order-3.exp
+++ b/pengine/test10/bundle-probe-order-3.exp
@@ -1,72 +1,63 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="16" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="centos2" on_node_uuid="2">
-        <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="centos2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald "/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="1">
-    <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="centos3" on_node_uuid="3">
+      <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"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="2">
+  <synapse id="1">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="centos2" on_node_uuid="2">
+      <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"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="3">
+  <synapse id="2">
     <action_set>
-      <rsc_op id="1" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="centos1" on_node_uuid="1">
+      <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"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="4">
+  <synapse id="3">
     <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos2" on_node_uuid="2">
+      <rsc_op id="7" operation="monitor" operation_key="galera-bundle-docker-1_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="5">
+  <synapse id="4">
     <action_set>
-      <rsc_op id="11" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos3" on_node_uuid="3">
+      <rsc_op id="13" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos3" on_node_uuid="3">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="6">
+  <synapse id="5">
     <action_set>
-      <rsc_op id="7" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos2" on_node_uuid="2">
+      <rsc_op id="9" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos2" on_node_uuid="2">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="7">
+  <synapse id="6">
     <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos1" on_node_uuid="1">
+      <rsc_op id="4" operation="monitor" operation_key="galera-bundle-docker-2_monitor_0" on_node="centos1" on_node_uuid="1">
         <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="centos1" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="docker.io/tripleoupstream/centos-binary-mariadb:latest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /foo:/etc/libqb/force-filesystem-sockets:ro -v /etc/my.cnf.d/galera.cnf:/etc/my.cnf.d/galera.cnf:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bundle-probe-order-3.summary b/pengine/test10/bundle-probe-order-3.summary
index 4faaa6d..cb384a7 100644
--- a/pengine/test10/bundle-probe-order-3.summary
+++ b/pengine/test10/bundle-probe-order-3.summary
@@ -11,7 +11,6 @@ Online: [ centos1 centos2 centos3 ]
 Transition Summary:
 
 Executing cluster transition:
- * Resource action: galera-bundle-docker-0 monitor=60000 on centos2
  * Resource action: galera-bundle-0 monitor on centos3
  * Resource action: galera-bundle-0 monitor on centos2
  * Resource action: galera-bundle-0 monitor on centos1
diff --git a/pengine/test10/bundle-probe-remotes.exp b/pengine/test10/bundle-probe-remotes.exp
index ebf778c..601b689 100644
--- a/pengine/test10/bundle-probe-remotes.exp
+++ b/pengine/test10/bundle-probe-remotes.exp
@@ -555,7 +555,7 @@
     <action_set>
       <rsc_op id="72" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_60000" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes 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" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes 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" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -568,7 +568,7 @@
     <action_set>
       <rsc_op id="71" operation="start" operation_key="scale1-bundle-docker-0_start_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -614,7 +614,7 @@
     <action_set>
       <rsc_op id="59" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -627,7 +627,7 @@
     <action_set>
       <rsc_op id="53" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -640,7 +640,7 @@
     <action_set>
       <rsc_op id="47" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -653,7 +653,7 @@
     <action_set>
       <rsc_op id="35" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -662,7 +662,7 @@
     <action_set>
       <rsc_op id="20" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -671,7 +671,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="scale1-bundle-docker-0_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-0" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-0:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -754,7 +754,7 @@
     <action_set>
       <rsc_op id="76" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_60000" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes 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" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes 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" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -767,7 +767,7 @@
     <action_set>
       <rsc_op id="75" operation="start" operation_key="scale1-bundle-docker-1_start_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -813,7 +813,7 @@
     <action_set>
       <rsc_op id="60" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -826,7 +826,7 @@
     <action_set>
       <rsc_op id="54" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -839,7 +839,7 @@
     <action_set>
       <rsc_op id="48" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -852,7 +852,7 @@
     <action_set>
       <rsc_op id="37" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -861,7 +861,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -870,7 +870,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="scale1-bundle-docker-1_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-1" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-1:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -953,7 +953,7 @@
     <action_set>
       <rsc_op id="80" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_60000" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes 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" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes 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" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -966,7 +966,7 @@
     <action_set>
       <rsc_op id="79" operation="start" operation_key="scale1-bundle-docker-2_start_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1012,7 +1012,7 @@
     <action_set>
       <rsc_op id="61" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1025,7 +1025,7 @@
     <action_set>
       <rsc_op id="55" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1038,7 +1038,7 @@
     <action_set>
       <rsc_op id="49" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1051,7 +1051,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1060,7 +1060,7 @@
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1069,7 +1069,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="scale1-bundle-docker-2_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-2" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-2:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1152,7 +1152,7 @@
     <action_set>
       <rsc_op id="84" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_60000" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1168,7 +1168,7 @@
     <action_set>
       <rsc_op id="83" operation="start" operation_key="scale1-bundle-docker-3_start_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1217,7 +1217,7 @@
     <action_set>
       <rsc_op id="62" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1230,7 +1230,7 @@
     <action_set>
       <rsc_op id="56" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1243,7 +1243,7 @@
     <action_set>
       <rsc_op id="50" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1256,7 +1256,7 @@
     <action_set>
       <rsc_op id="41" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1265,7 +1265,7 @@
     <action_set>
       <rsc_op id="26" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1274,7 +1274,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="scale1-bundle-docker-3_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-3" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-3" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-3:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1357,7 +1357,7 @@
     <action_set>
       <rsc_op id="88" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_60000" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1373,7 +1373,7 @@
     <action_set>
       <rsc_op id="87" operation="start" operation_key="scale1-bundle-docker-4_start_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1422,7 +1422,7 @@
     <action_set>
       <rsc_op id="63" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1435,7 +1435,7 @@
     <action_set>
       <rsc_op id="57" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1448,7 +1448,7 @@
     <action_set>
       <rsc_op id="51" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1461,7 +1461,7 @@
     <action_set>
       <rsc_op id="43" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1470,7 +1470,7 @@
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1479,7 +1479,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="scale1-bundle-docker-4_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-4" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-4" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-4:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1562,7 +1562,7 @@
     <action_set>
       <rsc_op id="92" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_60000" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1578,7 +1578,7 @@
     <action_set>
       <rsc_op id="91" operation="start" operation_key="scale1-bundle-docker-5_start_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1627,7 +1627,7 @@
     <action_set>
       <rsc_op id="64" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_0" on_node="c09-h10-r630" on_node_uuid="c09-h10-r630" router_node="c09-h07-r630">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h10-r630" CRM_meta_on_node_uuid="c09-h10-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1640,7 +1640,7 @@
     <action_set>
       <rsc_op id="58" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_0" on_node="c09-h09-r630" on_node_uuid="c09-h09-r630" router_node="c09-h06-r630">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h09-r630" CRM_meta_on_node_uuid="c09-h09-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1653,7 +1653,7 @@
     <action_set>
       <rsc_op id="52" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_0" on_node="c09-h08-r630" on_node_uuid="c09-h08-r630" router_node="c09-h05-r630">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h08-r630" CRM_meta_on_node_uuid="c09-h08-r630" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1666,7 +1666,7 @@
     <action_set>
       <rsc_op id="45" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_0" on_node="c09-h07-r630" on_node_uuid="3">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h07-r630" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1675,7 +1675,7 @@
     <action_set>
       <rsc_op id="30" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_0" on_node="c09-h06-r630" on_node_uuid="2">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h06-r630" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -1684,7 +1684,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="scale1-bundle-docker-5_monitor_0" on_node="c09-h05-r630" on_node_uuid="1">
         <primitive id="scale1-bundle-docker-5" class="ocf" provider="heartbeat" type="docker"/>
-        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
+        <attributes CRM_meta_on_node="c09-h05-r630" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="beekhof:remote" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/scale1-bundle-5" reuse="false" run_cmd="/usr/sbin/pacemaker_remoted" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3131 -v /dev/log:/dev/log -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/scale1-bundle-5:/var/log --user=root --log-driver=journald "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/clone-no-shuffle.summary b/pengine/test10/clone-no-shuffle.summary
index c9cb373..50dd872 100644
--- a/pengine/test10/clone-no-shuffle.summary
+++ b/pengine/test10/clone-no-shuffle.summary
@@ -12,7 +12,7 @@ Transition Summary:
  * Start   stonith-1	(dktest1sles10)
  * Stop       drbd1:0       ( Master dktest2sles10 )   due to node availability
  * Start   drbd1:1	(dktest1sles10)
- * Stop    testip	(dktest2sles10)
+ * Stop       testip        (        dktest2sles10 )   due to node availability
 
 Executing cluster transition:
  * Resource action: stonith-1       monitor on dktest2sles10
diff --git a/pengine/test10/cloned-group-stop.summary b/pengine/test10/cloned-group-stop.summary
index 4d5f390..dd1b02c 100644
--- a/pengine/test10/cloned-group-stop.summary
+++ b/pengine/test10/cloned-group-stop.summary
@@ -23,16 +23,16 @@ Transition Summary:
  * Stop       keystone:0            ( rhos4-node4 )   due to unrunnable qpidd-clone running
  * Stop       keystone:1            ( rhos4-node3 )   due to unrunnable qpidd-clone running
  * Stop       glance-fs:0           ( rhos4-node4 )   due to required keystone-clone running
- * Stop       glance-registry:0     ( rhos4-node4 )   due to required glance-fs:0 start
+ * Stop       glance-registry:0     ( rhos4-node4 )   due to required glance-fs:0 stop
  * Stop       glance-api:0          ( rhos4-node4 )   due to required glance-registry:0 start
  * Stop       glance-fs:1           ( rhos4-node3 )   due to required keystone-clone running
- * Stop       glance-registry:1     ( rhos4-node3 )   due to required glance-fs:1 start
+ * Stop       glance-registry:1     ( rhos4-node3 )   due to required glance-fs:1 stop
  * Stop       glance-api:1          ( rhos4-node3 )   due to required glance-registry:1 start
  * Stop       cinder-api:0          ( rhos4-node4 )   due to required glance-clone running
- * Stop       cinder-scheduler:0    ( rhos4-node4 )   due to required cinder-api:0 start
+ * Stop       cinder-scheduler:0    ( rhos4-node4 )   due to required cinder-api:0 stop
  * Stop       cinder-volume:0       ( rhos4-node4 )   due to required cinder-scheduler:0 start
  * Stop       cinder-api:1          ( rhos4-node3 )   due to required glance-clone running
- * Stop       cinder-scheduler:1    ( rhos4-node3 )   due to required cinder-api:1 start
+ * Stop       cinder-scheduler:1    ( rhos4-node3 )   due to required cinder-api:1 stop
  * Stop       cinder-volume:1       ( rhos4-node3 )   due to required cinder-scheduler:1 start
 
 Executing cluster transition:
diff --git a/pengine/test10/cloned-group.summary b/pengine/test10/cloned-group.summary
index 1c4f277..0c9c061 100644
--- a/pengine/test10/cloned-group.summary
+++ b/pengine/test10/cloned-group.summary
@@ -11,7 +11,7 @@ OFFLINE: [ webcluster02 ]
      Stopped: [ webcluster02 ]
 
 Transition Summary:
- * Restart    apache2:0         ( webcluster01 )  
+ * Restart    apache2:0         ( webcluster01 )   due to resource definition change
  * Restart    mysql-proxy:0     ( webcluster01 )   due to required apache2:0 start
  * Stop    apache2:2	(webcluster01)  	due to node availability
  * Stop    mysql-proxy:2	(webcluster01)  	due to node availability
diff --git a/pengine/test10/colocation_constraint_stops_slave.summary b/pengine/test10/colocation_constraint_stops_slave.summary
index 4af4415..4a5a582 100644
--- a/pengine/test10/colocation_constraint_stops_slave.summary
+++ b/pengine/test10/colocation_constraint_stops_slave.summary
@@ -10,7 +10,7 @@ OFFLINE: [ fc16-builder2 ]
 
 Transition Summary:
  * Stop       NATIVE_RSC_A:0     ( Slave fc16-builder )   due to node availability
- * Stop    NATIVE_RSC_B	(fc16-builder)
+ * Stop       NATIVE_RSC_B       (       fc16-builder )   due to node availability
 
 Executing cluster transition:
  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
diff --git a/pengine/test10/group5.dot b/pengine/test10/group5.dot
index c84be65..e17a7f7 100644
--- a/pengine/test10/group5.dot
+++ b/pengine/test10/group5.dot
@@ -1,7 +1,6 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold]
-"child_rsc1_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
 "child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold]
@@ -11,7 +10,6 @@
 "child_rsc1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
-"child_rsc2_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
 "child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold]
@@ -22,7 +20,6 @@
 "child_rsc2_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
-"child_rsc3_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
@@ -32,7 +29,6 @@
 "child_rsc3_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
@@ -55,7 +51,6 @@
 "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
 "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold]
-"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/group5.exp b/pengine/test10/group5.exp
index f03f4ab..c2c2edc 100644
--- a/pengine/test10/group5.exp
+++ b/pengine/test10/group5.exp
@@ -24,9 +24,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="18" operation="stopped" operation_key="rsc2_stopped_0"/>
        </trigger>
      </inputs>
@@ -137,9 +134,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="11" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
@@ -187,9 +181,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="13" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
@@ -237,9 +228,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="17" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
@@ -279,11 +267,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
diff --git a/pengine/test10/group5.summary b/pengine/test10/group5.summary
index f709b9d..7b158c0 100644
--- a/pengine/test10/group5.summary
+++ b/pengine/test10/group5.summary
@@ -21,8 +21,8 @@ Executing cluster transition:
  * Resource action: child_rsc1      monitor on node2
  * Resource action: child_rsc2      monitor on node2
  * Resource action: child_rsc3      monitor on node2
- * Resource action: rsc3            monitor on node2
  * Resource action: rsc3            stop on node1
+ * Resource action: rsc3            monitor on node2
  * Pseudo action:   rsc2_stop_0
  * Resource action: child_rsc3      stop on node1
  * Resource action: child_rsc2      stop on node1
diff --git a/pengine/test10/group6.dot b/pengine/test10/group6.dot
index 2141e02..fb15b68 100644
--- a/pengine/test10/group6.dot
+++ b/pengine/test10/group6.dot
@@ -1,7 +1,6 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold]
-"child_rsc1_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
 "child_rsc1_start_0 node2" -> "rsc1_running_0" [ style = bold]
@@ -11,7 +10,6 @@
 "child_rsc1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
-"child_rsc2_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
 "child_rsc2_start_0 node2" -> "rsc1_running_0" [ style = bold]
@@ -22,7 +20,6 @@
 "child_rsc2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
-"child_rsc3_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node2" -> "rsc1_running_0" [ style = bold]
 "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
@@ -32,7 +29,6 @@
 "child_rsc3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node2" -> "child_rsc4_start_0 node2" [ style = bold]
-"child_rsc4_monitor_0 node2" -> "child_rsc4_stop_0 node1" [ style = bold]
 "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
 "child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold]
@@ -42,7 +38,6 @@
 "child_rsc4_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
-"child_rsc5_monitor_0 node2" -> "child_rsc5_stop_0 node1" [ style = bold]
 "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
 "child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold]
@@ -53,7 +48,6 @@
 "child_rsc5_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
-"child_rsc6_monitor_0 node2" -> "child_rsc6_stop_0 node1" [ style = bold]
 "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
diff --git a/pengine/test10/group6.exp b/pengine/test10/group6.exp
index 7a7d265..1b1f906 100644
--- a/pengine/test10/group6.exp
+++ b/pengine/test10/group6.exp
@@ -93,9 +93,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="10" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
@@ -143,9 +140,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="12" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
@@ -193,9 +187,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="16" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
@@ -302,9 +293,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="20" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
@@ -352,9 +340,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="22" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
@@ -402,9 +387,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="26" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/group6.summary b/pengine/test10/group6.summary
index 0d18868..9d43e66 100644
--- a/pengine/test10/group6.summary
+++ b/pengine/test10/group6.summary
@@ -26,8 +26,8 @@ Executing cluster transition:
  * Pseudo action:   rsc2_stop_0
  * Resource action: child_rsc4      monitor on node2
  * Resource action: child_rsc5      monitor on node2
- * Resource action: child_rsc6      monitor on node2
  * Resource action: child_rsc6      stop on node1
+ * Resource action: child_rsc6      monitor on node2
  * Resource action: child_rsc5      stop on node1
  * Resource action: child_rsc4      stop on node1
  * Pseudo action:   rsc2_stopped_0
diff --git a/pengine/test10/group9.dot b/pengine/test10/group9.dot
index bc58f15..085f816 100644
--- a/pengine/test10/group9.dot
+++ b/pengine/test10/group9.dot
@@ -37,7 +37,6 @@
 "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold]
 "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc5_monitor_0 node2" -> "rsc5_start_0 node1" [ style = bold]
-"rsc5_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold]
 "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc5_start_0 node1" -> "foo_running_0" [ style = bold]
 "rsc5_start_0 node1" [ style=bold color="green" fontcolor="black" ]
@@ -47,7 +46,6 @@
 "rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold]
 "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold]
-"rsc6_monitor_0 node2" -> "rsc6_stop_0 node1" [ style = bold]
 "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc6_start_0 node2" -> "bar_running_0" [ style = bold]
 "rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold]
@@ -67,7 +65,6 @@
 "rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold]
 "rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_monitor_0 node2" -> "rsc8_start_0 node2" [ style = bold]
-"rsc8_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold]
 "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc8_start_0 node2" -> "bar_running_0" [ style = bold]
 "rsc8_start_0 node2" [ style=bold color="green" fontcolor="black" ]
diff --git a/pengine/test10/group9.exp b/pengine/test10/group9.exp
index f57f2b4..62d2a40 100644
--- a/pengine/test10/group9.exp
+++ b/pengine/test10/group9.exp
@@ -157,9 +157,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="23" operation="stop" operation_key="foo_stop_0"/>
        </trigger>
      </inputs>
@@ -266,9 +263,6 @@
         <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="32" operation="stop" operation_key="bar_stop_0"/>
        </trigger>
      </inputs>
@@ -360,9 +354,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="32" operation="stop" operation_key="bar_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/group9.summary b/pengine/test10/group9.summary
index ede3c82..1ef9d10 100644
--- a/pengine/test10/group9.summary
+++ b/pengine/test10/group9.summary
@@ -26,13 +26,13 @@ Executing cluster transition:
  * Pseudo action:   foo_stop_0
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc4            monitor on node2
+ * Resource action: rsc5            stop on node1
  * Resource action: rsc5            monitor on node2
  * Pseudo action:   bar_stop_0
  * Resource action: rsc6            monitor on node2
  * Resource action: rsc7            monitor on node2
- * Resource action: rsc8            monitor on node2
- * Resource action: rsc5            stop on node1
  * Resource action: rsc8            stop on node1
+ * Resource action: rsc8            monitor on node2
  * Resource action: rsc4            stop on node1
  * Resource action: rsc7            stop on node1
  * Pseudo action:   foo_stopped_0
diff --git a/pengine/test10/guest-node-host-dies.dot b/pengine/test10/guest-node-host-dies.dot
index 2082d07..a85250d 100644
--- a/pengine/test10/guest-node-host-dies.dot
+++ b/pengine/test10/guest-node-host-dies.dot
@@ -69,13 +69,10 @@ digraph "g" {
 "lxc-ms_stop_0 lxc2" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="orange"]
 "lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-3" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-4" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-5" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"]
 "lxc1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
@@ -87,13 +84,10 @@ digraph "g" {
 "lxc1_stop_0 rhel7-1" -> "lxc1_start_0 rhel7-2" [ style = bold]
 "lxc1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"]
 "lxc2_monitor_0 rhel7-2" -> "lxc2_start_0 rhel7-3" [ style = bold]
-"lxc2_monitor_0 rhel7-2" -> "lxc2_stop_0 rhel7-1" [ style = bold]
 "lxc2_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
 "lxc2_monitor_0 rhel7-4" -> "lxc2_start_0 rhel7-3" [ style = bold]
-"lxc2_monitor_0 rhel7-4" -> "lxc2_stop_0 rhel7-1" [ style = bold]
 "lxc2_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
 "lxc2_monitor_0 rhel7-5" -> "lxc2_start_0 rhel7-3" [ style = bold]
-"lxc2_monitor_0 rhel7-5" -> "lxc2_stop_0 rhel7-1" [ style = bold]
 "lxc2_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
 "lxc2_monitor_30000 rhel7-3" [ style=bold color="green" fontcolor="black"]
 "lxc2_start_0 rhel7-3" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
diff --git a/pengine/test10/guest-node-host-dies.exp b/pengine/test10/guest-node-host-dies.exp
index 06362e2..8dbadde 100644
--- a/pengine/test10/guest-node-host-dies.exp
+++ b/pengine/test10/guest-node-host-dies.exp
@@ -461,15 +461,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
@@ -550,15 +541,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="34">
diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
index ea0fa4c..4feee88 100644
--- a/pengine/test10/guest-node-host-dies.summary
+++ b/pengine/test10/guest-node-host-dies.summary
@@ -14,7 +14,7 @@ Transition Summary:
  * Fence (reboot) lxc2 (resource: container2) 'guest is unclean'
  * Fence (reboot) lxc1 (resource: container1) 'guest is unclean'
  * Fence (reboot) rhel7-1 'rsc_rhel7-1 is thought to be active there'
- * Restart    Fencing         (            rhel7-4 )  
+ * Restart    Fencing         (            rhel7-4 )   due to resource definition change
  * Move       rsc_rhel7-1     ( rhel7-1 -> rhel7-5 )  
  * Recover    container1      ( rhel7-1 -> rhel7-2 )  
  * Recover    container2      ( rhel7-1 -> rhel7-3 )  
diff --git a/pengine/test10/inc12.summary b/pengine/test10/inc12.summary
index cfe99c5..97a834f 100644
--- a/pengine/test10/inc12.summary
+++ b/pengine/test10/inc12.summary
@@ -41,13 +41,13 @@ Transition Summary:
  * Stop    ocf_192.168.100.181	(c001n02)  	due to node availability
  * Stop    heartbeat_192.168.100.182	(c001n02)  	due to node availability
  * Stop    ocf_192.168.100.183	(c001n02)  	due to node availability
- * Stop    lsb_dummy	(c001n04)
- * Stop    rsc_c001n03	(c001n05)
- * Stop    rsc_c001n02	(c001n02)
- * Stop    rsc_c001n04	(c001n04)
- * Stop    rsc_c001n05	(c001n05)
- * Stop    rsc_c001n06	(c001n06)
- * Stop    rsc_c001n07	(c001n07)
+ * Stop       lsb_dummy                     (       c001n04 )   due to node availability
+ * Stop       rsc_c001n03                   (       c001n05 )   due to node availability
+ * Stop       rsc_c001n02                   (       c001n02 )   due to node availability
+ * Stop       rsc_c001n04                   (       c001n04 )   due to node availability
+ * Stop       rsc_c001n05                   (       c001n05 )   due to node availability
+ * Stop       rsc_c001n06                   (       c001n06 )   due to node availability
+ * Stop       rsc_c001n07                   (       c001n07 )   due to node availability
  * Stop    child_DoFencing:0	(c001n02)  	due to node availability
  * Stop    child_DoFencing:1	(c001n04)  	due to node availability
  * Stop    child_DoFencing:2	(c001n05)  	due to node availability
diff --git a/pengine/test10/inc2.dot b/pengine/test10/inc2.dot
index cd250e5..34d55a8 100644
--- a/pengine/test10/inc2.dot
+++ b/pengine/test10/inc2.dot
@@ -4,7 +4,6 @@
 "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold]
 "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold]
@@ -13,7 +12,6 @@
 "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold]
 "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold]
 "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold]
diff --git a/pengine/test10/inc2.exp b/pengine/test10/inc2.exp
index 92b4cf1..51bef01 100644
--- a/pengine/test10/inc2.exp
+++ b/pengine/test10/inc2.exp
@@ -42,9 +42,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
@@ -83,9 +80,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/inc3.dot b/pengine/test10/inc3.dot
index 113541a..e04a654 100644
--- a/pengine/test10/inc3.dot
+++ b/pengine/test10/inc3.dot
@@ -4,7 +4,6 @@
 "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold]
 "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold]
@@ -13,7 +12,6 @@
 "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold]
 "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold]
 "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold]
@@ -33,7 +31,6 @@
 "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc2:3_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold]
 "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold]
@@ -42,7 +39,6 @@
 "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold]
 "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc2:4_monitor_0 node1" -> "child_rsc2:4_stop_0 node2" [ style = bold]
 "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold]
diff --git a/pengine/test10/inc3.exp b/pengine/test10/inc3.exp
index 4c1e46d..baa921f 100644
--- a/pengine/test10/inc3.exp
+++ b/pengine/test10/inc3.exp
@@ -42,9 +42,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="23" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
@@ -83,9 +80,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="23" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
@@ -251,9 +245,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="child_rsc2:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="37" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
@@ -292,9 +283,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="37" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/inc4.dot b/pengine/test10/inc4.dot
index c5a1a00..9f70f8a 100644
--- a/pengine/test10/inc4.dot
+++ b/pengine/test10/inc4.dot
@@ -4,7 +4,6 @@
 "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold]
 "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:2_start_0 node2" -> "child_rsc1:3_start_0 node2" [ style = bold]
@@ -14,7 +13,6 @@
 "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold]
 "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold]
 "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold]
@@ -36,7 +34,6 @@
 "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc2:3_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold]
 "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:3_start_0 node1" -> "child_rsc2:4_start_0 node1" [ style = bold]
@@ -46,7 +43,6 @@
 "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold]
 "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc2:4_monitor_0 node1" -> "child_rsc2:4_stop_0 node2" [ style = bold]
 "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold]
diff --git a/pengine/test10/inc4.exp b/pengine/test10/inc4.exp
index 0d767d6..b7c160e 100644
--- a/pengine/test10/inc4.exp
+++ b/pengine/test10/inc4.exp
@@ -42,9 +42,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="18" operation="stop" operation_key="child_rsc1:3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
@@ -89,9 +86,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="20" operation="stop" operation_key="child_rsc1:4_stop_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
@@ -260,9 +254,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="child_rsc2:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-       <trigger>
         <rsc_op id="33" operation="stop" operation_key="child_rsc2:4_stop_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
@@ -307,9 +298,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="37" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/inc5.dot b/pengine/test10/inc5.dot
index 684cd95..c9fa119 100644
--- a/pengine/test10/inc5.dot
+++ b/pengine/test10/inc5.dot
@@ -6,7 +6,6 @@
 "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:0_monitor_0 node2" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc2:1_monitor_0 node2" -> "child_rsc2:1_stop_0 node1" [ style = bold]
 "child_rsc2:1_monitor_0 node2" -> "rsc2_start_0" [ style = bold]
 "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold]
@@ -25,7 +24,6 @@
 "child_rsc3:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4:0_monitor_0 node2" -> "rsc4_start_0" [ style = bold]
 "child_rsc4:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
-"child_rsc4:1_monitor_0 node2" -> "child_rsc4:1_stop_0 node1" [ style = bold]
 "child_rsc4:1_monitor_0 node2" -> "rsc4_start_0" [ style = bold]
 "child_rsc4:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold]
@@ -40,7 +38,6 @@
 "child_rsc4:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5:0_monitor_0 node1" -> "rsc5_start_0" [ style = bold]
 "child_rsc5:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc5:1_monitor_0 node1" -> "child_rsc5:1_stop_0 node2" [ style = bold]
 "child_rsc5:1_monitor_0 node1" -> "rsc5_start_0" [ style = bold]
 "child_rsc5:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold]
@@ -59,7 +56,6 @@
 "child_rsc6:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc7:0_monitor_0 node1" -> "rsc7_start_0" [ style = bold]
 "child_rsc7:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc7:1_monitor_0 node1" -> "child_rsc7:1_stop_0 node2" [ style = bold]
 "child_rsc7:1_monitor_0 node1" -> "rsc7_start_0" [ style = bold]
 "child_rsc7:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold]
diff --git a/pengine/test10/inc5.exp b/pengine/test10/inc5.exp
index 5eff72f..89e064f 100644
--- a/pengine/test10/inc5.exp
+++ b/pengine/test10/inc5.exp
@@ -69,9 +69,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="21" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="48" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
@@ -235,9 +232,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="26" operation="monitor" operation_key="child_rsc4:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="64" operation="stop" operation_key="rsc4_stop_0"/>
        </trigger>
      </inputs>
@@ -365,9 +359,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="child_rsc5:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="72" operation="stop" operation_key="rsc5_stop_0"/>
        </trigger>
      </inputs>
@@ -531,9 +522,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="14" operation="monitor" operation_key="child_rsc7:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-       <trigger>
         <pseudo_event id="88" operation="stop" operation_key="rsc7_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/load-stopped-loop.summary b/pengine/test10/load-stopped-loop.summary
index bc5a0f9..93e675d 100644
--- a/pengine/test10/load-stopped-loop.summary
+++ b/pengine/test10/load-stopped-loop.summary
@@ -149,8 +149,8 @@ Transition Summary:
  * Reload     vds-ok-pool-1-iscsi:0                       (         mgmt01 )  
  * Reload     vds-ok-pool-1-iscsi:1                       (          v03-b )  
  * Reload     vds-ok-pool-1-iscsi:2                       (          v03-a )  
- * Restart    stonith-v03-b                               (          v03-a )  
- * Restart    stonith-v03-a                               (          v03-b )  
+ * Restart    stonith-v03-b                               (          v03-a )   due to resource definition change
+ * Restart    stonith-v03-a                               (          v03-b )   due to resource definition change
  * Migrate    license.anbriz.vds-ok.com-vm                ( v03-b -> v03-a )  
  * Migrate    terminal0.anbriz.vds-ok.com-vm              ( v03-a -> v03-b )  
  * Start   vd01-d.cdev.ttc.prague.cz.vds-ok.com-vm	(v03-a)
diff --git a/pengine/test10/master-9.summary b/pengine/test10/master-9.summary
index 55ccf50..9554242 100644
--- a/pengine/test10/master-9.summary
+++ b/pengine/test10/master-9.summary
@@ -41,7 +41,7 @@ Transition Summary:
  * Start      rsc_va1                  (   va1 )   due to no quorum (blocked)
  * Start      rsc_test02               (   va1 )   due to no quorum (blocked)
  * Stop    child_DoFencing:1	(ibm1)  	due to node availability
- * Promote    ocf_msdummy:0            ( Stopped -> Master va1 )   due to node availability (blocked)
+ * Promote    ocf_msdummy:0            ( Stopped -> Master va1 )   blocked
  * Start      ocf_msdummy:1            (   va1 )   due to no quorum (blocked)
 
 Executing cluster transition:
diff --git a/pengine/test10/migrate-1.dot b/pengine/test10/migrate-1.dot
index ffd25ec..650a071 100644
--- a/pengine/test10/migrate-1.dot
+++ b/pengine/test10/migrate-1.dot
@@ -7,7 +7,6 @@
 "rsc3_migrate_to_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" -> "rsc3_migrate_to_0 node1" [ style = bold]
 "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold]
-"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/migrate-1.exp b/pengine/test10/migrate-1.exp
index 399cc8c..e842659 100644
--- a/pengine/test10/migrate-1.exp
+++ b/pengine/test10/migrate-1.exp
@@ -52,9 +52,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
-       </trigger>
-      <trigger>
         <rsc_op id="6" operation="migrate_from" operation_key="rsc3_migrate_from_0" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
diff --git a/pengine/test10/migrate-shutdown.summary b/pengine/test10/migrate-shutdown.summary
index 508c399..24008a9 100644
--- a/pengine/test10/migrate-shutdown.summary
+++ b/pengine/test10/migrate-shutdown.summary
@@ -26,15 +26,15 @@ Transition Summary:
  * Shutdown pcmk-3
  * Shutdown pcmk-2
  * Shutdown pcmk-1
- * Stop    Fencing	(pcmk-1)
+ * Stop       Fencing              (        pcmk-1 )   due to node availability
  * Stop    r192.168.122.105	(pcmk-2)  	due to node availability
  * Stop    r192.168.122.106	(pcmk-2)  	due to node availability
  * Stop    r192.168.122.107	(pcmk-2)  	due to node availability
- * Stop    rsc_pcmk-1	(pcmk-1)
- * Stop    rsc_pcmk-2	(pcmk-2)
- * Stop    rsc_pcmk-4	(pcmk-4)
- * Stop    lsb-dummy	(pcmk-2)
- * Stop    migrator	(pcmk-1)
+ * Stop       rsc_pcmk-1           (        pcmk-1 )   due to node availability
+ * Stop       rsc_pcmk-2           (        pcmk-2 )   due to node availability
+ * Stop       rsc_pcmk-4           (        pcmk-4 )   due to node availability
+ * Stop       lsb-dummy            (        pcmk-2 )   due to node availability
+ * Stop       migrator             (        pcmk-1 )   due to node availability
  * Stop    ping-1:0	(pcmk-1)  	due to node availability
  * Stop    ping-1:1	(pcmk-2)  	due to node availability
  * Stop    ping-1:2	(pcmk-4)  	due to node availability
diff --git a/pengine/test10/mon-rsc-2.dot b/pengine/test10/mon-rsc-2.dot
index 9e370fe..c47d2aa 100644
--- a/pengine/test10/mon-rsc-2.dot
+++ b/pengine/test10/mon-rsc-2.dot
@@ -1,7 +1,6 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"rsc1_monitor_0 node1" -> "rsc1_stop_0 node2" [ style = bold]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" -> "rsc1_monitor_5000 node1" [ style = bold]
diff --git a/pengine/test10/mon-rsc-2.exp b/pengine/test10/mon-rsc-2.exp
index 5afe53f..526abeb 100644
--- a/pengine/test10/mon-rsc-2.exp
+++ b/pengine/test10/mon-rsc-2.exp
@@ -35,11 +35,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
diff --git a/pengine/test10/mon-rsc-2.summary b/pengine/test10/mon-rsc-2.summary
index 6c219b5..c4611c4 100644
--- a/pengine/test10/mon-rsc-2.summary
+++ b/pengine/test10/mon-rsc-2.summary
@@ -9,8 +9,8 @@ Transition Summary:
  * Move       rsc1    ( node2 -> node1 )  
 
 Executing cluster transition:
- * Resource action: rsc1            monitor on node1
  * Resource action: rsc1            stop on node2
+ * Resource action: rsc1            monitor on node1
  * Pseudo action:   all_stopped
  * Resource action: rsc1            start on node1
  * Resource action: rsc1            monitor=5000 on node1
diff --git a/pengine/test10/mon-rsc-4.dot b/pengine/test10/mon-rsc-4.dot
index 9e370fe..c47d2aa 100644
--- a/pengine/test10/mon-rsc-4.dot
+++ b/pengine/test10/mon-rsc-4.dot
@@ -1,7 +1,6 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"rsc1_monitor_0 node1" -> "rsc1_stop_0 node2" [ style = bold]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" -> "rsc1_monitor_5000 node1" [ style = bold]
diff --git a/pengine/test10/mon-rsc-4.exp b/pengine/test10/mon-rsc-4.exp
index 914535b..41c3b17 100644
--- a/pengine/test10/mon-rsc-4.exp
+++ b/pengine/test10/mon-rsc-4.exp
@@ -19,11 +19,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
diff --git a/pengine/test10/mon-rsc-4.summary b/pengine/test10/mon-rsc-4.summary
index d4debf3..3c3f0ba 100644
--- a/pengine/test10/mon-rsc-4.summary
+++ b/pengine/test10/mon-rsc-4.summary
@@ -9,10 +9,10 @@ Transition Summary:
  * Move       rsc1    ( node2 -> node1 )  
 
 Executing cluster transition:
- * Resource action: rsc1            monitor on node1
  * Resource action: rsc1            stop on node2
- * Resource action: rsc1            start on node1
+ * Resource action: rsc1            monitor on node1
  * Pseudo action:   all_stopped
+ * Resource action: rsc1            start on node1
  * Resource action: rsc1            monitor=5000 on node1
 
 Revised cluster status:
diff --git a/pengine/test10/monitor-onfail-stop.summary b/pengine/test10/monitor-onfail-stop.summary
index 54ad25a..6c100c0 100644
--- a/pengine/test10/monitor-onfail-stop.summary
+++ b/pengine/test10/monitor-onfail-stop.summary
@@ -6,7 +6,7 @@ OFFLINE: [ fc16-builder2 ]
  A	(ocf::pacemaker:Dummy):	FAILED fc16-builder 
 
 Transition Summary:
- * Stop    A	(fc16-builder)
+ * Stop       A       ( fc16-builder )   due to node availability
 
 Executing cluster transition:
  * Resource action: A               stop on fc16-builder
diff --git a/pengine/test10/node-maintenance-1.summary b/pengine/test10/node-maintenance-1.summary
index 85dfb46..196c144 100644
--- a/pengine/test10/node-maintenance-1.summary
+++ b/pengine/test10/node-maintenance-1.summary
@@ -8,7 +8,7 @@ Online: [ node1 ]
  rsc2	(ocf::pacemaker:Dummy):	Started node2 (unmanaged)
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/notify-3.dot b/pengine/test10/notify-3.dot
index 26b4899..bb75ccb 100644
--- a/pengine/test10/notify-3.dot
+++ b/pengine/test10/notify-3.dot
@@ -10,7 +10,6 @@
 "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
 "child_rsc1:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"child_rsc1:1_monitor_0 node1" -> "child_rsc1:1_stop_0 node2" [ style = bold]
 "child_rsc1:1_monitor_0 node1" -> "rsc1_start_0" [ style = bold]
 "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold]
diff --git a/pengine/test10/notify-3.exp b/pengine/test10/notify-3.exp
index fb96109..d878783 100644
--- a/pengine/test10/notify-3.exp
+++ b/pengine/test10/notify-3.exp
@@ -111,9 +111,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="17" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/novell-251689.summary b/pengine/test10/novell-251689.summary
index 8d69588..04bbe59 100644
--- a/pengine/test10/novell-251689.summary
+++ b/pengine/test10/novell-251689.summary
@@ -16,7 +16,7 @@ Online: [ node1 node2 ]
  sles10	(ocf::heartbeat:Xen):	Started node2 ( disabled ) 
 
 Transition Summary:
- * Stop    sles10	(node2)
+ * Stop       sles10     ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: sles10          stop on node2
diff --git a/pengine/test10/novell-252693-2.dot b/pengine/test10/novell-252693-2.dot
index dec80eb..c628b47 100644
--- a/pengine/test10/novell-252693-2.dot
+++ b/pengine/test10/novell-252693-2.dot
@@ -108,7 +108,6 @@
 "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black" ]
 "sles10_monitor_0 node1" -> "sles10_migrate_to_0 node2" [ style = bold]
 "sles10_monitor_0 node1" -> "sles10_start_0 node1" [ style = bold]
-"sles10_monitor_0 node1" -> "sles10_stop_0 node2" [ style = bold]
 "sles10_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "sles10_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ]
 "sles10_start_0 node1" -> "sles10_monitor_10000 node1" [ style = bold]
diff --git a/pengine/test10/novell-252693-2.exp b/pengine/test10/novell-252693-2.exp
index 364692c..6e75a4f 100644
--- a/pengine/test10/novell-252693-2.exp
+++ b/pengine/test10/novell-252693-2.exp
@@ -683,9 +683,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="sles10_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
-      </trigger>
-      <trigger>
         <rsc_op id="80" operation="migrate_from" operation_key="sles10_migrate_from_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
       </trigger>
     </inputs>
diff --git a/pengine/test10/novell-252693-3.dot b/pengine/test10/novell-252693-3.dot
index e26b164..28e9113 100644
--- a/pengine/test10/novell-252693-3.dot
+++ b/pengine/test10/novell-252693-3.dot
@@ -134,7 +134,6 @@
 "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black"]
 "sles10_monitor_0 node1" -> "sles10_migrate_to_0 node2" [ style = bold]
 "sles10_monitor_0 node1" -> "sles10_start_0 node1" [ style = bold]
-"sles10_monitor_0 node1" -> "sles10_stop_0 node2" [ style = bold]
 "sles10_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "sles10_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ]
 "sles10_start_0 node1" -> "sles10_monitor_10000 node1" [ style = bold]
diff --git a/pengine/test10/novell-252693-3.exp b/pengine/test10/novell-252693-3.exp
index 9c97271..4605df4 100644
--- a/pengine/test10/novell-252693-3.exp
+++ b/pengine/test10/novell-252693-3.exp
@@ -812,9 +812,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="sles10_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
-       </trigger>
-      <trigger>
         <rsc_op id="81" operation="migrate_from" operation_key="sles10_migrate_from_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
       </trigger>
      </inputs>
diff --git a/pengine/test10/order-serialize-set.summary b/pengine/test10/order-serialize-set.summary
index a9f97a3..a2fe27b 100644
--- a/pengine/test10/order-serialize-set.summary
+++ b/pengine/test10/order-serialize-set.summary
@@ -15,8 +15,8 @@ Online: [ xen-b ]
  Email_Alerting	(ocf::heartbeat:MailTo):	Started xen-b
 
 Transition Summary:
- * Restart    xen-a-fencing     (          xen-b )  
- * Stop    xen-b-fencing	(xen-a)
+ * Restart    xen-a-fencing     (          xen-b )   due to resource definition change
+ * Stop       xen-b-fencing     (          xen-a )   due to node availability
  * Migrate    db                ( xen-a -> xen-b )  
  * Migrate    core-101          ( xen-a -> xen-b )  
  * Migrate    core-200          ( xen-a -> xen-b )  
diff --git a/pengine/test10/order-serialize.summary b/pengine/test10/order-serialize.summary
index f58a6bc..eac994f 100644
--- a/pengine/test10/order-serialize.summary
+++ b/pengine/test10/order-serialize.summary
@@ -15,8 +15,8 @@ Online: [ xen-b ]
  Email_Alerting	(ocf::heartbeat:MailTo):	Started xen-b
 
 Transition Summary:
- * Restart    xen-a-fencing     (          xen-b )  
- * Stop    xen-b-fencing	(xen-a)
+ * Restart    xen-a-fencing     (          xen-b )   due to resource definition change
+ * Stop       xen-b-fencing     (          xen-a )   due to node availability
  * Migrate    db                ( xen-a -> xen-b )  
  * Migrate    core-101          ( xen-a -> xen-b )  
  * Migrate    core-200          ( xen-a -> xen-b )  
diff --git a/pengine/test10/order3.dot b/pengine/test10/order3.dot
index 1243eac..87b1b36 100644
--- a/pengine/test10/order3.dot
+++ b/pengine/test10/order3.dot
@@ -1,7 +1,6 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
@@ -9,7 +8,6 @@
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" -> "rsc3_start_0 node2" [ style = bold]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
@@ -19,7 +17,6 @@
 "rsc2_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold]
 "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold]
-"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0 node1" -> "all_stopped" [ style = bold]
@@ -27,7 +24,6 @@
 "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold]
 "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold]
-"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_start_0 node2" -> "rsc2_start_0 node2" [ style = bold]
 "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
diff --git a/pengine/test10/order3.exp b/pengine/test10/order3.exp
index 655ad74..f4833e6 100644
--- a/pengine/test10/order3.exp
+++ b/pengine/test10/order3.exp
@@ -24,9 +24,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="8" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
@@ -71,9 +68,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="10" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
@@ -113,11 +107,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="8">
      <action_set>
@@ -153,9 +143,6 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-       <trigger>
         <rsc_op id="8" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
diff --git a/pengine/test10/order3.summary b/pengine/test10/order3.summary
index 6694c0e..b22ff75 100644
--- a/pengine/test10/order3.summary
+++ b/pengine/test10/order3.summary
@@ -16,9 +16,9 @@ Transition Summary:
 Executing cluster transition:
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc2            monitor on node2
+ * Resource action: rsc3            stop on node1
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc4            monitor on node2
- * Resource action: rsc3            stop on node1
  * Resource action: rsc2            stop on node1
  * Resource action: rsc4            stop on node1
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/order5.dot b/pengine/test10/order5.dot
index db0ce44..a1ac025 100644
--- a/pengine/test10/order5.dot
+++ b/pengine/test10/order5.dot
@@ -2,7 +2,6 @@
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
@@ -10,7 +9,6 @@
 "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold]
-"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_stop_0 node1" -> "all_stopped" [ style = bold]
@@ -18,7 +16,6 @@
 "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold]
-"rsc6_monitor_0 node1" -> "rsc6_stop_0 node2" [ style = bold]
 "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_stop_0 node2" -> "all_stopped" [ style = bold]
@@ -26,7 +23,6 @@
 "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold]
-"rsc8_monitor_0 node1" -> "rsc8_stop_0 node2" [ style = bold]
 "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_stop_0 node2" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/order5.exp b/pengine/test10/order5.exp
index e019ca3..a0c2a15 100644
--- a/pengine/test10/order5.exp
+++ b/pengine/test10/order5.exp
@@ -31,11 +31,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
@@ -78,11 +74,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
@@ -125,11 +117,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="11">
      <action_set>
@@ -172,11 +160,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="15">
      <action_set>
diff --git a/pengine/test10/order5.summary b/pengine/test10/order5.summary
index db222c4..703f66f 100644
--- a/pengine/test10/order5.summary
+++ b/pengine/test10/order5.summary
@@ -19,17 +19,17 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: rsc1            monitor on node2
+ * Resource action: rsc2            stop on node1
  * Resource action: rsc2            monitor on node2
  * Resource action: rsc3            monitor on node2
+ * Resource action: rsc4            stop on node1
  * Resource action: rsc4            monitor on node2
  * Resource action: rsc5            monitor on node1
+ * Resource action: rsc6            stop on node2
  * Resource action: rsc6            monitor on node1
  * Resource action: rsc7            monitor on node1
- * Resource action: rsc8            monitor on node1
- * Resource action: rsc2            stop on node1
- * Resource action: rsc4            stop on node1
- * Resource action: rsc6            stop on node2
  * Resource action: rsc8            stop on node2
+ * Resource action: rsc8            monitor on node1
  * Pseudo action:   all_stopped
  * Resource action: rsc2            start on node2
  * Resource action: rsc4            start on node2
diff --git a/pengine/test10/order6.dot b/pengine/test10/order6.dot
index db0ce44..a1ac025 100644
--- a/pengine/test10/order6.dot
+++ b/pengine/test10/order6.dot
@@ -2,7 +2,6 @@
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
@@ -10,7 +9,6 @@
 "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold]
-"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_stop_0 node1" -> "all_stopped" [ style = bold]
@@ -18,7 +16,6 @@
 "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold]
-"rsc6_monitor_0 node1" -> "rsc6_stop_0 node2" [ style = bold]
 "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_stop_0 node2" -> "all_stopped" [ style = bold]
@@ -26,7 +23,6 @@
 "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold]
-"rsc8_monitor_0 node1" -> "rsc8_stop_0 node2" [ style = bold]
 "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_stop_0 node2" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/order6.exp b/pengine/test10/order6.exp
index d6eb81e..513f221 100644
--- a/pengine/test10/order6.exp
+++ b/pengine/test10/order6.exp
@@ -31,11 +31,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
@@ -78,11 +74,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
@@ -125,11 +117,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="11">
      <action_set>
@@ -172,11 +160,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="15">
      <action_set>
diff --git a/pengine/test10/order6.summary b/pengine/test10/order6.summary
index db222c4..703f66f 100644
--- a/pengine/test10/order6.summary
+++ b/pengine/test10/order6.summary
@@ -19,17 +19,17 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: rsc1            monitor on node2
+ * Resource action: rsc2            stop on node1
  * Resource action: rsc2            monitor on node2
  * Resource action: rsc3            monitor on node2
+ * Resource action: rsc4            stop on node1
  * Resource action: rsc4            monitor on node2
  * Resource action: rsc5            monitor on node1
+ * Resource action: rsc6            stop on node2
  * Resource action: rsc6            monitor on node1
  * Resource action: rsc7            monitor on node1
- * Resource action: rsc8            monitor on node1
- * Resource action: rsc2            stop on node1
- * Resource action: rsc4            stop on node1
- * Resource action: rsc6            stop on node2
  * Resource action: rsc8            stop on node2
+ * Resource action: rsc8            monitor on node1
  * Pseudo action:   all_stopped
  * Resource action: rsc2            start on node2
  * Resource action: rsc4            start on node2
diff --git a/pengine/test10/orphan-1.summary b/pengine/test10/orphan-1.summary
index 69bfb52..0ab96f4 100644
--- a/pengine/test10/orphan-1.summary
+++ b/pengine/test10/orphan-1.summary
@@ -9,7 +9,7 @@ Online: [ c001n01 c001n02 c001n03 c001n08 ]
  rsc_c001n08	(ocf::heartbeat:IPaddr):	 ORPHANED Started c001n08
 
 Transition Summary:
- * Stop    rsc_c001n08	(c001n08)
+ * Stop       rsc_c001n08     ( c001n08 )   due to node availability
 
 Executing cluster transition:
  * Resource action: DcIPaddr        monitor on c001n08
diff --git a/pengine/test10/orphan-2.summary b/pengine/test10/orphan-2.summary
index 7bc8221..e04363a 100644
--- a/pengine/test10/orphan-2.summary
+++ b/pengine/test10/orphan-2.summary
@@ -9,7 +9,7 @@ Online: [ c001n01 c001n02 c001n03 c001n08 ]
  rsc_c001n08	(ocf::heartbeat:IPaddr):	 ORPHANED Started c001n08
 
 Transition Summary:
- * Stop    rsc_c001n08	(c001n08)
+ * Stop       rsc_c001n08     ( c001n08 )   due to node availability
 
 Executing cluster transition:
  * Resource action: DcIPaddr        monitor on c001n08
diff --git a/pengine/test10/params-1.dot b/pengine/test10/params-1.dot
index 658d0c1..d44a701 100644
--- a/pengine/test10/params-1.dot
+++ b/pengine/test10/params-1.dot
@@ -1,13 +1,10 @@
  digraph "g" {
 "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n02" [ style = bold]
-"DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_stop_0 c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_start_0 c001n02" [ style = bold]
-"DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_stop_0 c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_start_0 c001n02" [ style = bold]
-"DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_stop_0 c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = bold]
diff --git a/pengine/test10/params-1.exp b/pengine/test10/params-1.exp
index d2efaf3..87e2669 100644
--- a/pengine/test10/params-1.exp
+++ b/pengine/test10/params-1.exp
@@ -6,17 +6,7 @@
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.20"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="19" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
diff --git a/pengine/test10/params-1.summary b/pengine/test10/params-1.summary
index 26fdecf..b237672 100644
--- a/pengine/test10/params-1.summary
+++ b/pengine/test10/params-1.summary
@@ -9,12 +9,15 @@ Online: [ c001n01 c001n02 c001n03 c001n08 ]
  rsc_c001n01	(ocf::heartbeat:IPaddr):	Started c001n01
 
 Transition Summary:
- * Restart    DcIPaddr     ( c001n02 )  
+ * Restart    DcIPaddr     ( c001n02 )   due to resource definition change
 
 Executing cluster transition:
+ * Resource action: DcIPaddr        stop on c001n02
  * Resource action: DcIPaddr        monitor on c001n08
  * Resource action: DcIPaddr        monitor on c001n03
  * Resource action: DcIPaddr        monitor on c001n01
+ * Resource action: DcIPaddr        start on c001n02
+ * Resource action: DcIPaddr        monitor=5000 on c001n02
  * Resource action: rsc_c001n08     monitor on c001n03
  * Resource action: rsc_c001n08     monitor on c001n02
  * Resource action: rsc_c001n08     monitor on c001n01
@@ -30,9 +33,6 @@ Executing cluster transition:
  * Resource action: rsc_c001n01     monitor on c001n08
  * Resource action: rsc_c001n01     monitor on c001n03
  * Resource action: rsc_c001n01     monitor on c001n02
- * Resource action: DcIPaddr        stop on c001n02
- * Resource action: DcIPaddr        start on c001n02
- * Resource action: DcIPaddr        monitor=5000 on c001n02
  * Pseudo action:   all_stopped
 
 Revised cluster status:
diff --git a/pengine/test10/params-2.dot b/pengine/test10/params-2.dot
index 67f2873..162a5ae 100644
--- a/pengine/test10/params-2.dot
+++ b/pengine/test10/params-2.dot
@@ -11,7 +11,6 @@
 "rsc2_monitor_0 node1" -> "rsc2_start_0 node2" [ style = bold]
 "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node3" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node3" -> "rsc2_stop_0 node2" [ style = bold]
 "rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node2" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp
index 3cbfe33..f6d7c53 100644
--- a/pengine/test10/params-2.exp
+++ b/pengine/test10/params-2.exp
@@ -86,11 +86,7 @@
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
diff --git a/pengine/test10/params-2.summary b/pengine/test10/params-2.summary
index 97510f6..c19659a 100644
--- a/pengine/test10/params-2.summary
+++ b/pengine/test10/params-2.summary
@@ -8,7 +8,7 @@ Online: [ node1 node2 node3 ]
 
 Transition Summary:
  * Shutdown node1
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
  * Restart    rsc2    ( node2 )  
  * Start   rsc3	(node3)
 
diff --git a/pengine/test10/params-5.dot b/pengine/test10/params-5.dot
index ee756dc..cb00964 100644
--- a/pengine/test10/params-5.dot
+++ b/pengine/test10/params-5.dot
@@ -1,13 +1,10 @@
 digraph "g" {
 "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n02" [ style = bold]
-"DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_stop_0 c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_start_0 c001n02" [ style = bold]
-"DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_stop_0 c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_start_0 c001n02" [ style = bold]
-"DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_stop_0 c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = bold]
diff --git a/pengine/test10/params-5.exp b/pengine/test10/params-5.exp
index 1208fd0..788dd8b 100644
--- a/pengine/test10/params-5.exp
+++ b/pengine/test10/params-5.exp
@@ -6,17 +6,7 @@
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.20"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="19" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
diff --git a/pengine/test10/params-5.summary b/pengine/test10/params-5.summary
index 26fdecf..b237672 100644
--- a/pengine/test10/params-5.summary
+++ b/pengine/test10/params-5.summary
@@ -9,12 +9,15 @@ Online: [ c001n01 c001n02 c001n03 c001n08 ]
  rsc_c001n01	(ocf::heartbeat:IPaddr):	Started c001n01
 
 Transition Summary:
- * Restart    DcIPaddr     ( c001n02 )  
+ * Restart    DcIPaddr     ( c001n02 )   due to resource definition change
 
 Executing cluster transition:
+ * Resource action: DcIPaddr        stop on c001n02
  * Resource action: DcIPaddr        monitor on c001n08
  * Resource action: DcIPaddr        monitor on c001n03
  * Resource action: DcIPaddr        monitor on c001n01
+ * Resource action: DcIPaddr        start on c001n02
+ * Resource action: DcIPaddr        monitor=5000 on c001n02
  * Resource action: rsc_c001n08     monitor on c001n03
  * Resource action: rsc_c001n08     monitor on c001n02
  * Resource action: rsc_c001n08     monitor on c001n01
@@ -30,9 +33,6 @@ Executing cluster transition:
  * Resource action: rsc_c001n01     monitor on c001n08
  * Resource action: rsc_c001n01     monitor on c001n03
  * Resource action: rsc_c001n01     monitor on c001n02
- * Resource action: DcIPaddr        stop on c001n02
- * Resource action: DcIPaddr        start on c001n02
- * Resource action: DcIPaddr        monitor=5000 on c001n02
  * Pseudo action:   all_stopped
 
 Revised cluster status:
diff --git a/pengine/test10/placement-capacity.summary b/pengine/test10/placement-capacity.summary
index 4d58b57..232c3f2 100644
--- a/pengine/test10/placement-capacity.summary
+++ b/pengine/test10/placement-capacity.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc2	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/placement-location.summary b/pengine/test10/placement-location.summary
index 7a90533..2a5c9f5 100644
--- a/pengine/test10/placement-location.summary
+++ b/pengine/test10/placement-location.summary
@@ -7,7 +7,7 @@ Online: [ node2 ]
  rsc2	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/placement-priority.summary b/pengine/test10/placement-priority.summary
index 5781801..1d59837 100644
--- a/pengine/test10/placement-priority.summary
+++ b/pengine/test10/placement-priority.summary
@@ -7,7 +7,7 @@ Online: [ node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node1
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/placement-stickiness.summary b/pengine/test10/placement-stickiness.summary
index 7a90533..2a5c9f5 100644
--- a/pengine/test10/placement-stickiness.summary
+++ b/pengine/test10/placement-stickiness.summary
@@ -7,7 +7,7 @@ Online: [ node2 ]
  rsc2	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/probe-2.summary b/pengine/test10/probe-2.summary
index 7e74efc..7b8b124 100644
--- a/pengine/test10/probe-2.summary
+++ b/pengine/test10/probe-2.summary
@@ -41,7 +41,7 @@ Transition Summary:
  * Stop    mysql-proxy:1	(wc02)  	due to node availability
  * Stop    fs_www:1	(wc02)  	due to node availability
  * Stop    apache2:1	(wc02)  	due to node availability
- * Restart    stonith_rackpdu:0     (                 wc01 )  
+ * Restart    stonith_rackpdu:0     (                 wc01 )   due to resource definition change
  * Stop    stonith_rackpdu:1	(wc02)  	due to node availability
 
 Executing cluster transition:
diff --git a/pengine/test10/quorum-1.dot b/pengine/test10/quorum-1.dot
index 8918d24..84dc105 100644
--- a/pengine/test10/quorum-1.dot
+++ b/pengine/test10/quorum-1.dot
@@ -2,7 +2,6 @@
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/quorum-1.exp b/pengine/test10/quorum-1.exp
index 6f2f40f..65bfe1d 100644
--- a/pengine/test10/quorum-1.exp
+++ b/pengine/test10/quorum-1.exp
@@ -31,11 +31,7 @@
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
diff --git a/pengine/test10/quorum-1.summary b/pengine/test10/quorum-1.summary
index fd01941..813a91a 100644
--- a/pengine/test10/quorum-1.summary
+++ b/pengine/test10/quorum-1.summary
@@ -12,13 +12,13 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: rsc1            monitor on node2
+ * Resource action: rsc2            stop on node1
  * Resource action: rsc2            monitor on node2
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc3            monitor on node1
- * Resource action: rsc2            stop on node1
- * Resource action: rsc3            start on node1
  * Pseudo action:   all_stopped
  * Resource action: rsc2            start on node2
+ * Resource action: rsc3            start on node1
 
 Revised cluster status:
 Online: [ node1 node2 ]
diff --git a/pengine/test10/quorum-2.dot b/pengine/test10/quorum-2.dot
index cff2834..6fbb758 100644
--- a/pengine/test10/quorum-2.dot
+++ b/pengine/test10/quorum-2.dot
@@ -2,7 +2,6 @@
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/quorum-2.exp b/pengine/test10/quorum-2.exp
index 002cc16..c9ea21b 100644
--- a/pengine/test10/quorum-2.exp
+++ b/pengine/test10/quorum-2.exp
@@ -31,11 +31,7 @@
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
diff --git a/pengine/test10/quorum-2.summary b/pengine/test10/quorum-2.summary
index f603bfa..fdc8976 100644
--- a/pengine/test10/quorum-2.summary
+++ b/pengine/test10/quorum-2.summary
@@ -12,10 +12,10 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: rsc1            monitor on node2
+ * Resource action: rsc2            stop on node1
  * Resource action: rsc2            monitor on node2
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc3            monitor on node1
- * Resource action: rsc2            stop on node1
  * Pseudo action:   all_stopped
  * Resource action: rsc2            start on node2
 
diff --git a/pengine/test10/quorum-3.dot b/pengine/test10/quorum-3.dot
index 88eff9f..e3cf205 100644
--- a/pengine/test10/quorum-3.dot
+++ b/pengine/test10/quorum-3.dot
@@ -1,14 +1,12 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = dashed]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=dashed color="red" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = dashed]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/quorum-3.exp b/pengine/test10/quorum-3.exp
index e263aeb..bf93855 100644
--- a/pengine/test10/quorum-3.exp
+++ b/pengine/test10/quorum-3.exp
@@ -6,11 +6,7 @@
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="1">
      <action_set>
@@ -28,11 +24,7 @@
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
   <synapse id="3">
     <action_set>
diff --git a/pengine/test10/quorum-3.summary b/pengine/test10/quorum-3.summary
index cda0278..50adf18 100644
--- a/pengine/test10/quorum-3.summary
+++ b/pengine/test10/quorum-3.summary
@@ -12,12 +12,12 @@ Transition Summary:
  * Start      rsc3    ( node1 )   due to no quorum (blocked)
 
 Executing cluster transition:
+ * Resource action: rsc1            stop on node1
  * Resource action: rsc1            monitor on node2
+ * Resource action: rsc2            stop on node1
  * Resource action: rsc2            monitor on node2
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc3            monitor on node1
- * Resource action: rsc1            stop on node1
- * Resource action: rsc2            stop on node1
  * Pseudo action:   all_stopped
 
 Revised cluster status:
diff --git a/pengine/test10/rec-node-10.dot b/pengine/test10/rec-node-10.dot
index e66dfa1..fac66e6 100644
--- a/pengine/test10/rec-node-10.dot
+++ b/pengine/test10/rec-node-10.dot
@@ -1,14 +1,12 @@
  digraph "g" {
 "all_stopped" [ style=dashed color="red" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = dashed]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = dashed]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = dashed]
 "rsc1_stop_0 node1" [ style=dashed color="red" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = dashed]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = dashed]
diff --git a/pengine/test10/rec-node-11.dot b/pengine/test10/rec-node-11.dot
index db3bc09..3b54385 100644
--- a/pengine/test10/rec-node-11.dot
+++ b/pengine/test10/rec-node-11.dot
@@ -14,7 +14,6 @@ digraph "g" {
 "group1_stopped_0" -> "rsc3_stop_0 node2" [ style = bold]
 "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" -> "group1_running_0" [ style = bold]
 "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold]
@@ -24,7 +23,6 @@ digraph "g" {
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" -> "group1_running_0" [ style = bold]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
diff --git a/pengine/test10/rec-node-11.exp b/pengine/test10/rec-node-11.exp
index 6c7efcc..352771a 100644
--- a/pengine/test10/rec-node-11.exp
+++ b/pengine/test10/rec-node-11.exp
@@ -120,9 +120,6 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
@@ -175,9 +172,6 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="13" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
     </inputs>
diff --git a/pengine/test10/rec-node-4.dot b/pengine/test10/rec-node-4.dot
index c1b46b9..2e37e11 100644
--- a/pengine/test10/rec-node-4.dot
+++ b/pengine/test10/rec-node-4.dot
@@ -2,14 +2,12 @@ digraph "g" {
 "all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/rec-node-4.exp b/pengine/test10/rec-node-4.exp
index 2aaa34b..61ec54c 100644
--- a/pengine/test10/rec-node-4.exp
+++ b/pengine/test10/rec-node-4.exp
@@ -53,9 +53,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
@@ -96,9 +93,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
diff --git a/pengine/test10/rec-node-6.dot b/pengine/test10/rec-node-6.dot
index c1b46b9..2e37e11 100644
--- a/pengine/test10/rec-node-6.dot
+++ b/pengine/test10/rec-node-6.dot
@@ -2,14 +2,12 @@ digraph "g" {
 "all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/rec-node-6.exp b/pengine/test10/rec-node-6.exp
index 2aaa34b..61ec54c 100644
--- a/pengine/test10/rec-node-6.exp
+++ b/pengine/test10/rec-node-6.exp
@@ -53,9 +53,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
@@ -96,9 +93,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
diff --git a/pengine/test10/rec-node-7.dot b/pengine/test10/rec-node-7.dot
index c1b46b9..2e37e11 100644
--- a/pengine/test10/rec-node-7.dot
+++ b/pengine/test10/rec-node-7.dot
@@ -2,14 +2,12 @@ digraph "g" {
 "all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/rec-node-7.exp b/pengine/test10/rec-node-7.exp
index 2aaa34b..61ec54c 100644
--- a/pengine/test10/rec-node-7.exp
+++ b/pengine/test10/rec-node-7.exp
@@ -53,9 +53,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
@@ -96,9 +93,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
diff --git a/pengine/test10/rec-node-8.dot b/pengine/test10/rec-node-8.dot
index 6621154..f5c426a 100644
--- a/pengine/test10/rec-node-8.dot
+++ b/pengine/test10/rec-node-8.dot
@@ -1,14 +1,12 @@
  digraph "g" {
 "all_stopped" [ style=dashed color="red" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed]
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = dashed]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = dashed]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = dashed]
 "rsc1_stop_0 node1" [ style=dashed color="red" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed]
-"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = dashed]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ]
 "rsc2_stop_0 node1" -> "all_stopped" [ style = dashed]
diff --git a/pengine/test10/rec-rsc-0.summary b/pengine/test10/rec-rsc-0.summary
index e33ffeb..b3d4686 100644
--- a/pengine/test10/rec-rsc-0.summary
+++ b/pengine/test10/rec-rsc-0.summary
@@ -5,8 +5,8 @@ Online: [ node1 node2 ]
  rsc1	(heartbeat:apache):	FAILED [ node1 node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node1)
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node1 )   due to node availability
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/rec-rsc-5.dot b/pengine/test10/rec-rsc-5.dot
index 7a20e74..d5fc8bf 100644
--- a/pengine/test10/rec-rsc-5.dot
+++ b/pengine/test10/rec-rsc-5.dot
@@ -8,7 +8,6 @@ digraph "g" {
 "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold]
 "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold]
-"rsc2_monitor_0 node1" -> "rsc2_stop_0 node2" [ style = bold]
 "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node2" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp
index 3092adf..792b328 100644
--- a/pengine/test10/rec-rsc-5.exp
+++ b/pengine/test10/rec-rsc-5.exp
@@ -93,9 +93,6 @@
       <trigger>
         <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
-      <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
diff --git a/pengine/test10/rec-rsc-7.summary b/pengine/test10/rec-rsc-7.summary
index d32bdba..5238323 100644
--- a/pengine/test10/rec-rsc-7.summary
+++ b/pengine/test10/rec-rsc-7.summary
@@ -5,8 +5,8 @@ Online: [ node1 node2 ]
  rsc1	(heartbeat:apache):	Started [ node1 node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node1)
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node1 )   due to node availability
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/remote-disable.summary b/pengine/test10/remote-disable.summary
index 2ec1748..f5de71f 100644
--- a/pengine/test10/remote-disable.summary
+++ b/pengine/test10/remote-disable.summary
@@ -13,7 +13,7 @@ RemoteOnline: [ remote1 ]
 
 Transition Summary:
  * Stop    remote1	(18builder)  	due to node availability
- * Stop    FAKE2	(remote1)
+ * Stop       FAKE2       (   remote1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: FAKE2           stop on remote1
diff --git a/pengine/test10/remote-fence-before-reconnect.summary b/pengine/test10/remote-fence-before-reconnect.summary
index 3aee89d..0761572 100644
--- a/pengine/test10/remote-fence-before-reconnect.summary
+++ b/pengine/test10/remote-fence-before-reconnect.summary
@@ -13,7 +13,7 @@ Online: [ c7auto1 c7auto2 c7auto3 ]
 
 Transition Summary:
  * Fence (reboot) c7auto4 'remote connection is unrecoverable'
- * Stop    c7auto4	(c7auto1)
+ * Stop       c7auto4     (            c7auto1 )   due to node availability
  * Move       fake2       ( c7auto4 -> c7auto1 )  
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-fence-unclean-3.summary b/pengine/test10/remote-fence-unclean-3.summary
index c866c4e..5abed37 100644
--- a/pengine/test10/remote-fence-unclean-3.summary
+++ b/pengine/test10/remote-fence-unclean-3.summary
@@ -36,7 +36,7 @@ Containers: [ galera-bundle-0:galera-bundle-docker-0 galera-bundle-1:galera-bund
 Transition Summary:
  * Fence (reboot) overcloud-novacompute-0 'the connection is unrecoverable'
  * Start   fence1	(overcloud-controller-0)
- * Stop    overcloud-novacompute-0	(overcloud-controller-0)
+ * Stop       overcloud-novacompute-0     ( overcloud-controller-0 )   due to node availability
 
 Executing cluster transition:
  * Resource action: fence1          monitor on overcloud-controller-2
diff --git a/pengine/test10/remote-fence-unclean-3.xml b/pengine/test10/remote-fence-unclean-3.xml
index 66a4d8b..b3017b7 100644
--- a/pengine/test10/remote-fence-unclean-3.xml
+++ b/pengine/test10/remote-fence-unclean-3.xml
@@ -396,8 +396,8 @@
       <lrm id="3">
         <lrm_resources>
           <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="5:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;5:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="320" queue-time="0" op-digest="36504691d59c531fcd2e901e6f3ae280"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="1:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;1:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="19" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668697" exec-time="64" queue-time="0" op-digest="ada4303a4bab00851876e1a216333781"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="5:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;5:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="320" queue-time="0" op-digest="c340dabc02a122ab20f14b60f2602bbe"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="1:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;1:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="19" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668697" exec-time="64" queue-time="0" op-digest="0fb5d0fc32bf7b5ac2fded03f686b814"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;8:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1498668675" last-rc-change="1498668675" exec-time="28" queue-time="0" op-digest="a0d694ff5082677ff8994aed84eec10a"/>
@@ -416,8 +416,8 @@
             <lrm_rsc_op id="galera-bundle-docker-0_last_0" operation_key="galera-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="14:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;14:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1498668716" last-rc-change="1498668716" exec-time="28" queue-time="0" op-digest="cea4042997161052606b12bff643218c"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="12:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;12:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1498668757" last-rc-change="1498668757" exec-time="371" queue-time="0" op-digest="4a10b0bafda85bb1b0db4b969a2fd6e0"/>
-            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;3:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="38" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668758" exec-time="66" queue-time="1" op-digest="e4ffbb211cf0ba3edd20df1e4f2b7855"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="12:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;12:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1498668757" last-rc-change="1498668757" exec-time="371" queue-time="0" op-digest="6c2f81de1714e10eacba6279afe5e059"/>
+            <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;3:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="38" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668758" exec-time="66" queue-time="1" op-digest="fd04e5bc4ae1f504b2653c4326ef8132"/>
           </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"/>
@@ -430,8 +430,8 @@
             <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="27:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;27:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="47" rc-code="7" op-status="0" interval="0" last-run="1498668877" last-rc-change="1498668877" exec-time="32" queue-time="0" op-digest="6b370e7f473758a477ba7ba1a1d14fed"/>
           </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_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="23:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;23:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="56" rc-code="0" op-status="0" interval="0" last-run="1498668899" last-rc-change="1498668899" exec-time="311" queue-time="0" op-digest="b5e9788be69d5833dea37ab62a7ecff3"/>
-            <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="5:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;5:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="57" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668899" exec-time="66" queue-time="0" op-digest="30fb9b127cc681dc85f77c071f7148fa"/>
+            <lrm_rsc_op id="redis-bundle-docker-2_last_0" operation_key="redis-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="23:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;23:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="56" rc-code="0" op-status="0" interval="0" last-run="1498668899" last-rc-change="1498668899" exec-time="311" queue-time="0" op-digest="8c6035dc510b3d42f7ebc22c2a3a445c"/>
+            <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="5:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;5:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="57" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668899" exec-time="66" queue-time="0" op-digest="95e57f57b6c5a4bb2e252d22d70f01df"/>
           </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"/>
@@ -464,8 +464,8 @@
             <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="44:48:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;44:48:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="94" rc-code="7" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="37" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="144:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;144:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="99" rc-code="0" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="316" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="145:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;145:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="100" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668968" exec-time="63" queue-time="0" op-digest="8e98096b4e2923c7be3ce5fa2646c524"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-2_last_0" operation_key="haproxy-bundle-docker-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="144:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;144:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="99" rc-code="0" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="316" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="145:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;145:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="100" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668968" exec-time="63" queue-time="0" op-digest="6560898bb4a594e45af727baab2e600d"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="42:65:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;42:65:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-2" call-id="104" rc-code="7" op-status="0" interval="0" last-run="1498669495" last-rc-change="1498669495" exec-time="24" queue-time="1" op-digest="3aa35269c96594499406635b536dcf19"/>
@@ -491,8 +491,8 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;7:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="13" rc-code="7" op-status="0" interval="0" last-run="1498668675" last-rc-change="1498668675" exec-time="26" queue-time="0" op-digest="a0d694ff5082677ff8994aed84eec10a"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="6:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;6:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1498668696" last-rc-change="1498668696" exec-time="335" queue-time="0" op-digest="b44491dfb17f4d3efb632e88d48f0e66"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="2:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;2:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="19" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668697" exec-time="66" queue-time="0" op-digest="3cc227a509e334d8b937f677c7d77e87"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="6:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;6:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1498668696" last-rc-change="1498668696" exec-time="335" queue-time="0" op-digest="b8157caee3ea8178feaea3f60e89a55a"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="2:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;2:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="19" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668697" exec-time="66" queue-time="0" op-digest="c293cd7b72145ba015bbbd25294a08dc"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="5:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;5:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1498668675" last-rc-change="1498668675" exec-time="32" queue-time="0" op-digest="a0d694ff5082677ff8994aed84eec10a"/>
@@ -502,8 +502,8 @@
             <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_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="73b5463e899c27755cf6c0e1573fee0a"/>
-            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="6:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;6:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="38" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668758" exec-time="68" queue-time="0" op-digest="5b068abf556a53f4dc4ddbc5309805c7"/>
+            <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"/>
+            <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="6:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;6:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="38" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668758" exec-time="68" queue-time="0" op-digest="486cc657e64e3e5abaca075a67dd7fc9"/>
           </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="11:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;11:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1498668715" last-rc-change="1498668715" exec-time="36" queue-time="0" op-digest="cea4042997161052606b12bff643218c"/>
@@ -522,8 +522,8 @@
             <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="23:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;23:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="43" rc-code="7" op-status="0" interval="0" last-run="1498668877" last-rc-change="1498668877" exec-time="26" queue-time="0" op-digest="6b370e7f473758a477ba7ba1a1d14fed"/>
           </lrm_resource>
           <lrm_resource id="redis-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="24:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;24:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="56" rc-code="0" op-status="0" interval="0" last-run="1498668898" last-rc-change="1498668898" exec-time="324" queue-time="0" op-digest="b7d3010f6ffa7fbf0d5d35fdd98f3a8e"/>
-            <lrm_rsc_op id="redis-bundle-docker-1_monitor_60000" operation_key="redis-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="10:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;10:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="57" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668899" exec-time="66" queue-time="0" op-digest="f56b8a16be3a64834ccb8b159e9f99c4"/>
+            <lrm_rsc_op id="redis-bundle-docker-1_last_0" operation_key="redis-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="24:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;24:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="56" rc-code="0" op-status="0" interval="0" last-run="1498668898" last-rc-change="1498668898" exec-time="324" queue-time="0" op-digest="7cb97c89c7e1150856aeab87eff14450"/>
+            <lrm_rsc_op id="redis-bundle-docker-1_monitor_60000" operation_key="redis-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="10:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;10:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="57" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668899" exec-time="66" queue-time="0" op-digest="e76c2e8a26aabe056305ab7b9972c322"/>
           </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"/>
@@ -550,8 +550,8 @@
             <lrm_rsc_op id="ip-172.16.3.9_last_0" operation_key="ip-172.16.3.9_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="37:45:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;37:45:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="86" rc-code="7" op-status="0" interval="0" last-run="1498668961" last-rc-change="1498668961" exec-time="33" queue-time="0" op-digest="bfccf6cd1b96922f4a1da89429ba5d0c"/>
           </lrm_resource>
           <lrm_resource id="haproxy-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="142:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;142:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="99" rc-code="0" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="293" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-1_monitor_60000" operation_key="haproxy-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="143:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;143:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="100" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668968" exec-time="61" queue-time="0" op-digest="8e98096b4e2923c7be3ce5fa2646c524"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="142:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;142:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="99" rc-code="0" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="293" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-1_monitor_60000" operation_key="haproxy-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="143:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;143:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="100" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668968" exec-time="61" queue-time="0" op-digest="6560898bb4a594e45af727baab2e600d"/>
           </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="do_update_resource" crm_feature_set="3.0.12" transition-key="40:48:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;40:48:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="90" rc-code="7" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="24" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
@@ -563,8 +563,8 @@
             <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="41:65:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;41:65:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="104" rc-code="7" op-status="0" interval="0" last-run="1498669495" last-rc-change="1498669495" exec-time="31" queue-time="0" op-digest="3aa35269c96594499406635b536dcf19"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-backup-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="openstack-cinder-backup-docker-0_last_0" operation_key="openstack-cinder-backup-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="146:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;146:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="109" rc-code="0" op-status="0" interval="0" last-run="1498669534" last-rc-change="1498669534" exec-time="331" queue-time="0" op-digest="eedee9a7b2c178272325eaaf87df0b05"/>
-            <lrm_rsc_op id="openstack-cinder-backup-docker-0_monitor_60000" operation_key="openstack-cinder-backup-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="147:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;147:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="110" rc-code="0" op-status="0" interval="60000" last-rc-change="1498669534" exec-time="63" queue-time="0" op-digest="22c1ba2abb8623d212a79f54b6b106d7"/>
+            <lrm_rsc_op id="openstack-cinder-backup-docker-0_last_0" operation_key="openstack-cinder-backup-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="146:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;146:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="109" rc-code="0" op-status="0" interval="0" last-run="1498669534" last-rc-change="1498669534" exec-time="331" queue-time="0" op-digest="c2e5a326e7b0552b269c9eaea7582647"/>
+            <lrm_rsc_op id="openstack-cinder-backup-docker-0_monitor_60000" operation_key="openstack-cinder-backup-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="147:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;147:70:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-1" call-id="110" rc-code="0" op-status="0" interval="60000" last-rc-change="1498669534" exec-time="63" queue-time="0" op-digest="c56e6576dd6da1f19e625e9f6019ce5d"/>
           </lrm_resource>
           <lrm_resource id="overcloud-novacompute-0" class="ocf" provider="pacemaker" type="remote">
             <lrm_rsc_op id="overcloud-novacompute-0_last_0" operation_key="overcloud-novacompute-0_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.14" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1499057293" last-rc-change="1499057293" exec-time="0" queue-time="0" op-digest="be548bf9f751c937c78eb61c44187ad2"/>
@@ -587,16 +587,16 @@
             <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;3:6:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="9" rc-code="7" op-status="0" interval="0" last-run="1498668675" last-rc-change="1498668675" exec-time="36" queue-time="0" op-digest="a0d694ff5082677ff8994aed84eec10a"/>
           </lrm_resource>
           <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;7:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="324" queue-time="0" op-digest="1ef5258917c1ede92b7814bfe6a32a5a"/>
-            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;3:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="19" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668697" exec-time="67" queue-time="0" op-digest="586be2ae8d7a4941912d2a42f11f991d"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_0" operation_key="rabbitmq-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="7:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;7:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1498668697" last-rc-change="1498668697" exec-time="324" queue-time="0" op-digest="9d5e401cce0874816028f0e6f2f99fdd"/>
+            <lrm_rsc_op id="rabbitmq-bundle-docker-0_monitor_60000" operation_key="rabbitmq-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="3:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;3:8:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="19" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668697" exec-time="67" queue-time="0" op-digest="8712259bfb9d55ff9fbff5f39e5d8a30"/>
           </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_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="50cce6e3abf7894ffd01b9a4021482b8"/>
-            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="9:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;9:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="38" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668758" exec-time="71" queue-time="0" op-digest="249ca06c3daa0b28b190b0fcf20dbeb0"/>
+            <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"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_monitor_60000" operation_key="galera-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="9:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;9:11:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="38" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668758" exec-time="71" queue-time="0" op-digest="65788bd6ff81ed3cb6552df07faacd51"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-2_last_0" operation_key="galera-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="10:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;10:10:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="32" rc-code="7" op-status="0" interval="0" last-run="1498668716" last-rc-change="1498668716" exec-time="60" queue-time="0" op-digest="cea4042997161052606b12bff643218c"/>
@@ -609,8 +609,8 @@
             <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_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="d9a0fecf7d4c4aaf69665baf365326a6"/>
-            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="15:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;15:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="57" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668899" exec-time="74" queue-time="0" op-digest="53dc80266361c5e7e6a1a3d7cc77b1cd"/>
+            <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"/>
+            <lrm_rsc_op id="redis-bundle-docker-0_monitor_60000" operation_key="redis-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="15:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;15:24:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="57" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668899" exec-time="74" queue-time="0" op-digest="646f8db9f7baea61a60753b5ae8b9987"/>
           </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="22:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;22:22:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="51" rc-code="7" op-status="0" interval="0" last-run="1498668877" last-rc-change="1498668877" exec-time="48" queue-time="0" op-digest="6b370e7f473758a477ba7ba1a1d14fed"/>
@@ -649,12 +649,12 @@
             <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="38:48:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;38:48:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="94" rc-code="7" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="30" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
           </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_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="140:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;140:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="99" rc-code="0" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="350" queue-time="0" op-digest="50c5ea783cadafec1f3787e5cf2dcd62"/>
-            <lrm_rsc_op id="haproxy-bundle-docker-0_monitor_60000" operation_key="haproxy-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="141:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;141:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="100" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668968" exec-time="77" queue-time="0" op-digest="8e98096b4e2923c7be3ce5fa2646c524"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="140:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;140:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="99" rc-code="0" op-status="0" interval="0" last-run="1498668968" last-rc-change="1498668968" exec-time="350" queue-time="0" op-digest="59b63ee653b1666ceb30ec6e2d10eef7"/>
+            <lrm_rsc_op id="haproxy-bundle-docker-0_monitor_60000" operation_key="haproxy-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="141:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;141:48:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="100" rc-code="0" op-status="0" interval="60000" last-rc-change="1498668968" exec-time="77" queue-time="0" op-digest="6560898bb4a594e45af727baab2e600d"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-volume-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="143:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;143:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="105" rc-code="0" op-status="0" interval="0" last-run="1498669495" last-rc-change="1498669495" exec-time="322" queue-time="0" op-digest="3aa35269c96594499406635b536dcf19"/>
-            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="144:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;144:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="106" rc-code="0" op-status="0" interval="60000" last-rc-change="1498669495" exec-time="73" queue-time="0" op-digest="8bf789d58c162762d2d6f44701785901"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_last_0" operation_key="openstack-cinder-volume-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="143:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;143:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="105" rc-code="0" op-status="0" interval="0" last-run="1498669495" last-rc-change="1498669495" exec-time="322" queue-time="0" op-digest="6bca2ea371d88385f9492e607d2ba781"/>
+            <lrm_rsc_op id="openstack-cinder-volume-docker-0_monitor_60000" operation_key="openstack-cinder-volume-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="144:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:0;144:65:0:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="106" rc-code="0" op-status="0" interval="60000" last-rc-change="1498669495" exec-time="73" queue-time="0" op-digest="dead45fc070d603608d342428d68278f"/>
           </lrm_resource>
           <lrm_resource id="openstack-cinder-backup-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="openstack-cinder-backup-docker-0_last_0" operation_key="openstack-cinder-backup-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="41:70:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" transition-magic="0:7;41:70:7:9a3ef4a7-7b29-42c0-b0b3-e6b23c00a3a0" on_node="overcloud-controller-0" call-id="110" rc-code="7" op-status="0" interval="0" last-run="1498669534" last-rc-change="1498669534" exec-time="33" queue-time="0" op-digest="eedee9a7b2c178272325eaaf87df0b05"/>
diff --git a/pengine/test10/remote-fence-unclean2.summary b/pengine/test10/remote-fence-unclean2.summary
index bf7f907..2538823 100644
--- a/pengine/test10/remote-fence-unclean2.summary
+++ b/pengine/test10/remote-fence-unclean2.summary
@@ -11,7 +11,7 @@ OFFLINE: [ rhel7-alt3 ]
 
 Transition Summary:
  * Fence (reboot) rhel7-alt4 'fake is active there (fencing will be revoked if remote connection can be re-established elsewhere)'
- * Stop    fake	(rhel7-alt4)
+ * Stop       fake    ( rhel7-alt4 )   due to node availability
 
 Executing cluster transition:
  * Fencing rhel7-alt4 (reboot)
diff --git a/pengine/test10/remote-probe-disable.summary b/pengine/test10/remote-probe-disable.summary
index 1824da6..527120f 100644
--- a/pengine/test10/remote-probe-disable.summary
+++ b/pengine/test10/remote-probe-disable.summary
@@ -12,7 +12,7 @@ RemoteOnline: [ remote1 ]
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1
 
 Transition Summary:
- * Stop    remote1	(18builder)
+ * Stop       remote1     ( 18builder )   due to node availability
 
 Executing cluster transition:
  * Resource action: FAKE1           monitor on remote1
diff --git a/pengine/test10/remote-reconnect-delay.summary b/pengine/test10/remote-reconnect-delay.summary
index ea11483..bd46eae 100644
--- a/pengine/test10/remote-reconnect-delay.summary
+++ b/pengine/test10/remote-reconnect-delay.summary
@@ -28,7 +28,7 @@ RemoteOFFLINE: [ remote-rhel7-3 ]
  remote-rsc	(ocf::heartbeat:Dummy):	Started rhel7-1
 
 Transition Summary:
- * Restart    Fencing     ( rhel7-2 )  
+ * Restart    Fencing     ( rhel7-2 )   due to resource definition change
 
 Executing cluster transition:
  * Resource action: Fencing         stop on rhel7-2
diff --git a/pengine/test10/remote-recover-all.summary b/pengine/test10/remote-recover-all.summary
index de31212..6c9f058 100644
--- a/pengine/test10/remote-recover-all.summary
+++ b/pengine/test10/remote-recover-all.summary
@@ -51,8 +51,8 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop    haproxy:0	(controller-1)  	due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )  
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )  
+ * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
+ * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-recover-connection.summary b/pengine/test10/remote-recover-connection.summary
index 8e91068..b0433fe 100644
--- a/pengine/test10/remote-recover-connection.summary
+++ b/pengine/test10/remote-recover-connection.summary
@@ -47,8 +47,8 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop    haproxy:0	(controller-1)  	due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )  
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )  
+ * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
+ * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-recover-no-resources.summary b/pengine/test10/remote-recover-no-resources.summary
index c05e355..b682e5f 100644
--- a/pengine/test10/remote-recover-no-resources.summary
+++ b/pengine/test10/remote-recover-no-resources.summary
@@ -42,15 +42,15 @@ Transition Summary:
  * Fence (reboot) controller-1 'peer is no longer part of the cluster'
  * Stop    messaging-1	(controller-1)  	due to node availability
  * Move       galera-0                               ( controller-1 -> controller-2 )  
- * Stop    galera-2	(controller-1)
+ * Stop       galera-2                               (                 controller-1 )   due to node availability
  * Stop    rabbitmq:2	(messaging-1)  	due to node availability
  * Stop       redis:0                                (           Slave controller-1 )   due to node availability
  * Move       ip-172.17.1.14                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop    haproxy:0	(controller-1)  	due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )  
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )  
+ * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
+ * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-recover-unknown.summary b/pengine/test10/remote-recover-unknown.summary
index bfbe7d3..09f10d8 100644
--- a/pengine/test10/remote-recover-unknown.summary
+++ b/pengine/test10/remote-recover-unknown.summary
@@ -50,8 +50,8 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop    haproxy:0	(controller-1)  	due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )  
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )  
+ * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
+ * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-recovery.summary b/pengine/test10/remote-recovery.summary
index 8e91068..b0433fe 100644
--- a/pengine/test10/remote-recovery.summary
+++ b/pengine/test10/remote-recovery.summary
@@ -47,8 +47,8 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop    haproxy:0	(controller-1)  	due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )  
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )  
+ * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
+ * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-startup-probes.dot b/pengine/test10/remote-startup-probes.dot
index 573bb3c..7174acf 100644
--- a/pengine/test10/remote-startup-probes.dot
+++ b/pengine/test10/remote-startup-probes.dot
@@ -1,6 +1,5 @@
  digraph "g" {
 "FAKE1_monitor_0 remote1" -> "FAKE1_start_0 18node2" [ style = bold]
-"FAKE1_monitor_0 remote1" -> "FAKE1_stop_0 18builder" [ style = bold]
 "FAKE1_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
 "FAKE1_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"]
 "FAKE1_start_0 18node2" -> "FAKE1_monitor_60000 18node2" [ style = bold]
@@ -9,7 +8,6 @@
 "FAKE1_stop_0 18builder" -> "all_stopped" [ style = bold]
 "FAKE1_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE2_monitor_0 remote1" -> "FAKE2_start_0 remote1" [ style = bold]
-"FAKE2_monitor_0 remote1" -> "FAKE2_stop_0 18node2" [ style = bold]
 "FAKE2_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
 "FAKE2_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
 "FAKE2_start_0 remote1" -> "FAKE2_monitor_60000 remote1" [ style = bold]
diff --git a/pengine/test10/remote-startup-probes.exp b/pengine/test10/remote-startup-probes.exp
index 497e481..7ab0693 100644
--- a/pengine/test10/remote-startup-probes.exp
+++ b/pengine/test10/remote-startup-probes.exp
@@ -57,11 +57,7 @@
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="FAKE1_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
@@ -118,11 +114,7 @@
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="FAKE2_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="9">
     <action_set>
diff --git a/pengine/test10/remote-startup-probes.summary b/pengine/test10/remote-startup-probes.summary
index f47bf47..3e21d65 100644
--- a/pengine/test10/remote-startup-probes.summary
+++ b/pengine/test10/remote-startup-probes.summary
@@ -17,14 +17,14 @@ Transition Summary:
 
 Executing cluster transition:
  * Resource action: remote1         start on 18builder
+ * Resource action: FAKE1           stop on 18builder
  * Resource action: FAKE1           monitor on remote1
+ * Resource action: FAKE2           stop on 18node2
  * Resource action: FAKE2           monitor on remote1
  * Resource action: FAKE3           monitor on remote1
  * Resource action: FAKE4           monitor on remote1
- * Resource action: remote1         monitor=60000 on 18builder
- * Resource action: FAKE1           stop on 18builder
- * Resource action: FAKE2           stop on 18node2
  * Pseudo action:   all_stopped
+ * Resource action: remote1         monitor=60000 on 18builder
  * Resource action: FAKE1           start on 18node2
  * Resource action: FAKE2           start on remote1
  * Resource action: FAKE1           monitor=60000 on 18node2
diff --git a/pengine/test10/rsc-discovery-per-node.dot b/pengine/test10/rsc-discovery-per-node.dot
index 680e145..fa35cd8 100644
--- a/pengine/test10/rsc-discovery-per-node.dot
+++ b/pengine/test10/rsc-discovery-per-node.dot
@@ -13,10 +13,8 @@
 "FAKE1_start_0 18node2" -> "FAKE1_monitor_60000 18node2" [ style = bold]
 "FAKE1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
 "FAKE2_monitor_0 18node3" -> "FAKE2_start_0 18node3" [ style = bold]
-"FAKE2_monitor_0 18node3" -> "FAKE2_stop_0 18node2" [ style = bold]
 "FAKE2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "FAKE2_monitor_0 18node4" -> "FAKE2_start_0 18node3" [ style = bold]
-"FAKE2_monitor_0 18node4" -> "FAKE2_stop_0 18node2" [ style = bold]
 "FAKE2_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
 "FAKE2_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"]
 "FAKE2_start_0 18node3" -> "FAKE2_monitor_60000 18node3" [ style = bold]
@@ -25,10 +23,8 @@
 "FAKE2_stop_0 18node2" -> "all_stopped" [ style = bold]
 "FAKE2_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
 "FAKE3_monitor_0 18node3" -> "FAKE3_start_0 18node4" [ style = bold]
-"FAKE3_monitor_0 18node3" -> "FAKE3_stop_0 18builder" [ style = bold]
 "FAKE3_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "FAKE3_monitor_0 18node4" -> "FAKE3_start_0 18node4" [ style = bold]
-"FAKE3_monitor_0 18node4" -> "FAKE3_stop_0 18builder" [ style = bold]
 "FAKE3_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
 "FAKE3_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"]
 "FAKE3_start_0 18node4" -> "FAKE3_monitor_60000 18node4" [ style = bold]
@@ -37,10 +33,8 @@
 "FAKE3_stop_0 18builder" -> "all_stopped" [ style = bold]
 "FAKE3_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_0 18node3" -> "FAKE4_start_0 remote1" [ style = bold]
-"FAKE4_monitor_0 18node3" -> "FAKE4_stop_0 18node1" [ style = bold]
 "FAKE4_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_0 18node4" -> "FAKE4_start_0 remote1" [ style = bold]
-"FAKE4_monitor_0 18node4" -> "FAKE4_stop_0 18node1" [ style = bold]
 "FAKE4_monitor_0 18node4" [ style=bold color="green" fontcolor="black"]
 "FAKE4_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
 "FAKE4_start_0 remote1" -> "FAKE4_monitor_60000 remote1" [ style = bold]
diff --git a/pengine/test10/rsc-discovery-per-node.exp b/pengine/test10/rsc-discovery-per-node.exp
index a429298..434d9d0 100644
--- a/pengine/test10/rsc-discovery-per-node.exp
+++ b/pengine/test10/rsc-discovery-per-node.exp
@@ -186,14 +186,7 @@
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="monitor" operation_key="FAKE2_monitor_0" on_node="18node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="30" operation="monitor" operation_key="FAKE2_monitor_0" on_node="18node4" on_node_uuid="4"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="16">
     <action_set>
@@ -252,14 +245,7 @@
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="FAKE3_monitor_0" on_node="18node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="31" operation="monitor" operation_key="FAKE3_monitor_0" on_node="18node4" on_node_uuid="4"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="21">
     <action_set>
@@ -324,14 +310,7 @@
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="23" operation="monitor" operation_key="FAKE4_monitor_0" on_node="18node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="32" operation="monitor" operation_key="FAKE4_monitor_0" on_node="18node4" on_node_uuid="4"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="26">
     <action_set>
diff --git a/pengine/test10/rsc-discovery-per-node.summary b/pengine/test10/rsc-discovery-per-node.summary
index 13dff85..88b4623 100644
--- a/pengine/test10/rsc-discovery-per-node.summary
+++ b/pengine/test10/rsc-discovery-per-node.summary
@@ -45,10 +45,13 @@ Executing cluster transition:
  * Resource action: FAKE1           monitor on 18node2
  * Resource action: FAKE1           monitor on 18node1
  * Resource action: FAKE1           monitor on 18builder
+ * Resource action: FAKE2           stop on 18node2
  * Resource action: FAKE2           monitor on 18node4
  * Resource action: FAKE2           monitor on 18node3
+ * Resource action: FAKE3           stop on 18builder
  * Resource action: FAKE3           monitor on 18node4
  * Resource action: FAKE3           monitor on 18node3
+ * Resource action: FAKE4           stop on 18node1
  * Resource action: FAKE4           monitor on 18node4
  * Resource action: FAKE4           monitor on 18node3
  * Resource action: FAKE5           monitor on 18node4
@@ -68,11 +71,12 @@ Executing cluster transition:
  * Resource action: FAKECLONE2:3    monitor on 18node4
  * Resource action: FAKECLONE2:5    monitor on 18builder
  * Pseudo action:   FAKECLONE2-clone_start_0
+ * Pseudo action:   all_stopped
  * Resource action: remote1         start on 18builder
  * Resource action: FAKE1           start on 18node2
- * Resource action: FAKE2           stop on 18node2
- * Resource action: FAKE3           stop on 18builder
- * Resource action: FAKE4           stop on 18node1
+ * Resource action: FAKE2           start on 18node3
+ * Resource action: FAKE3           start on 18node4
+ * Resource action: FAKE4           start on remote1
  * Resource action: FAKE5           start on 18builder
  * Resource action: FAKECLONE1:0    start on 18node1
  * Resource action: FAKECLONE1:1    start on 18node2
@@ -88,12 +92,11 @@ Executing cluster transition:
  * Resource action: FAKECLONE2:4    start on remote1
  * Resource action: FAKECLONE2:5    start on 18builder
  * Pseudo action:   FAKECLONE2-clone_running_0
- * Pseudo action:   all_stopped
  * Resource action: remote1         monitor=60000 on 18builder
  * Resource action: FAKE1           monitor=60000 on 18node2
- * Resource action: FAKE2           start on 18node3
- * Resource action: FAKE3           start on 18node4
- * Resource action: FAKE4           start on remote1
+ * Resource action: FAKE2           monitor=60000 on 18node3
+ * Resource action: FAKE3           monitor=60000 on 18node4
+ * Resource action: FAKE4           monitor=60000 on remote1
  * Resource action: FAKE5           monitor=60000 on 18builder
  * Resource action: FAKECLONE1:0    monitor=60000 on 18node1
  * Resource action: FAKECLONE1:1    monitor=60000 on 18node2
@@ -107,9 +110,6 @@ Executing cluster transition:
  * Resource action: FAKECLONE2:3    monitor=60000 on 18node4
  * Resource action: FAKECLONE2:4    monitor=60000 on remote1
  * Resource action: FAKECLONE2:5    monitor=60000 on 18builder
- * Resource action: FAKE2           monitor=60000 on 18node3
- * Resource action: FAKE3           monitor=60000 on 18node4
- * Resource action: FAKE4           monitor=60000 on remote1
 
 Revised cluster status:
 Online: [ 18builder 18node1 18node2 18node3 18node4 ]
diff --git a/pengine/test10/rsc-sets-clone-1.dot b/pengine/test10/rsc-sets-clone-1.dot
index 58b2356..18a8865 100644
--- a/pengine/test10/rsc-sets-clone-1.dot
+++ b/pengine/test10/rsc-sets-clone-1.dot
@@ -62,7 +62,6 @@ digraph "g" {
 "stonithsys2_start_0 sys3" -> "stonithsys2_monitor_15000 sys3" [ style = bold]
 "stonithsys2_start_0 sys3" [ style=bold color="green" fontcolor="black" ]
 "stonithsys3_monitor_0 sys3" -> "stonithsys3_start_0 sys2" [ style = bold]
-"stonithsys3_monitor_0 sys3" -> "stonithsys3_stop_0 sys2" [ style = bold]
 "stonithsys3_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ]
 "stonithsys3_monitor_15000 sys2" [ style=bold color="green" fontcolor="black" ]
 "stonithsys3_start_0 sys2" -> "stonithsys3_monitor_15000 sys2" [ style = bold]
diff --git a/pengine/test10/rsc-sets-clone-1.exp b/pengine/test10/rsc-sets-clone-1.exp
index decabce..3a829b1 100644
--- a/pengine/test10/rsc-sets-clone-1.exp
+++ b/pengine/test10/rsc-sets-clone-1.exp
@@ -42,11 +42,7 @@
         <attributes CRM_meta_on_node="sys2" CRM_meta_on_node_uuid="sys2" CRM_meta_timeout="20000"  hostname="sys3" interface="lan" ipaddr="192.168.1.222" passwd="****" userid="admin"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="stonithsys3_monitor_0" on_node="sys3" on_node_uuid="sys3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
diff --git a/pengine/test10/rsc-sets-clone-1.summary b/pengine/test10/rsc-sets-clone-1.summary
index 211ad97..1f78d20 100644
--- a/pengine/test10/rsc-sets-clone-1.summary
+++ b/pengine/test10/rsc-sets-clone-1.summary
@@ -16,7 +16,7 @@ Online: [ sys2 sys3 ]
      Stopped (disabled): [ sys2 sys3 ]
 
 Transition Summary:
- * Restart    stonithsys3     (  sys2 )  
+ * Restart    stonithsys3     (  sys2 )   due to resource definition change
  * Start   controld:1	(sys3)
  * Start   clvmd:1	(sys3)
  * Start   o2cb:1	(sys3)
@@ -32,7 +32,10 @@ Executing cluster transition:
  * Resource action: vm2             monitor on sys3
  * Resource action: vm3             monitor on sys3
  * Resource action: vm4             monitor on sys3
+ * Resource action: stonithsys3     stop on sys2
  * Resource action: stonithsys3     monitor on sys3
+ * Resource action: stonithsys3     start on sys2
+ * Resource action: stonithsys3     monitor=15000 on sys2
  * Resource action: controld:1      monitor on sys3
  * Resource action: clvmd:1         monitor on sys3
  * Resource action: o2cb:1          monitor on sys3
@@ -46,9 +49,7 @@ Executing cluster transition:
  * Resource action: stonithsys2     monitor on sys3
  * Pseudo action:   load_stopped_sys3
  * Pseudo action:   load_stopped_sys2
- * Resource action: stonithsys3     stop on sys2
- * Resource action: stonithsys3     start on sys2
- * Resource action: stonithsys3     monitor=15000 on sys2
+ * Pseudo action:   all_stopped
  * Pseudo action:   basegrp:1_start_0
  * Resource action: controld:1      start on sys3
  * Resource action: clvmd:1         start on sys3
@@ -59,7 +60,6 @@ Executing cluster transition:
  * Resource action: vg2:1           start on sys3
  * Resource action: fs2:1           start on sys3
  * Resource action: stonithsys2     start on sys3
- * Pseudo action:   all_stopped
  * Pseudo action:   basegrp:1_running_0
  * Resource action: controld:1      monitor=10000 on sys3
  * Resource action: iscsi1:1        monitor=120000 on sys3
diff --git a/pengine/test10/rsc_dep4.dot b/pengine/test10/rsc_dep4.dot
index 44ac33c..0977367 100644
--- a/pengine/test10/rsc_dep4.dot
+++ b/pengine/test10/rsc_dep4.dot
@@ -12,7 +12,6 @@
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold]
-"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_stop_0 node1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/rsc_dep4.exp b/pengine/test10/rsc_dep4.exp
index cd326d5..f9c75fc 100644
--- a/pengine/test10/rsc_dep4.exp
+++ b/pengine/test10/rsc_dep4.exp
@@ -56,11 +56,7 @@
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000"  priority="2.0"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
    <synapse id="5" priority="2">
      <action_set>
diff --git a/pengine/test10/rsc_dep4.summary b/pengine/test10/rsc_dep4.summary
index b911b46..e97105e 100644
--- a/pengine/test10/rsc_dep4.summary
+++ b/pengine/test10/rsc_dep4.summary
@@ -15,15 +15,15 @@ Transition Summary:
 Executing cluster transition:
  * Resource action: rsc2            monitor on node2
  * Resource action: rsc2            monitor on node1
+ * Resource action: rsc4            stop on node1
  * Resource action: rsc4            monitor on node2
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc3            monitor on node1
- * Resource action: rsc2            start on node1
- * Resource action: rsc4            stop on node1
- * Resource action: rsc3            start on node2
  * Pseudo action:   all_stopped
+ * Resource action: rsc2            start on node1
  * Resource action: rsc4            start on node2
+ * Resource action: rsc3            start on node2
 
 Revised cluster status:
 Online: [ node1 node2 ]
diff --git a/pengine/test10/simple4.summary b/pengine/test10/simple4.summary
index fc81964..8484938 100644
--- a/pengine/test10/simple4.summary
+++ b/pengine/test10/simple4.summary
@@ -5,7 +5,7 @@ Online: [ node1 ]
  rsc1	(heartbeat:apache):	FAILED node1 
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/simple6.summary b/pengine/test10/simple6.summary
index 6010663..58b3e55 100644
--- a/pengine/test10/simple6.summary
+++ b/pengine/test10/simple6.summary
@@ -7,7 +7,7 @@ Online: [ node1 ]
 
 Transition Summary:
  * Start   rsc2	(node1)
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc2            monitor on node1
diff --git a/pengine/test10/simple7.summary b/pengine/test10/simple7.summary
index 021c15f..3b71657 100644
--- a/pengine/test10/simple7.summary
+++ b/pengine/test10/simple7.summary
@@ -6,7 +6,7 @@ Online: [ node1 ]
 
 Transition Summary:
  * Shutdown node1
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/stopped-monitor-03.summary b/pengine/test10/stopped-monitor-03.summary
index 521dc2f..c897eec 100644
--- a/pengine/test10/stopped-monitor-03.summary
+++ b/pengine/test10/stopped-monitor-03.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node1 ( disabled ) 
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/stopped-monitor-21.summary b/pengine/test10/stopped-monitor-21.summary
index 058cde3..7c2732d 100644
--- a/pengine/test10/stopped-monitor-21.summary
+++ b/pengine/test10/stopped-monitor-21.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	FAILED node1 ( disabled ) 
 
 Transition Summary:
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/stopped-monitor-22.summary b/pengine/test10/stopped-monitor-22.summary
index cb2d449..d26827a 100644
--- a/pengine/test10/stopped-monitor-22.summary
+++ b/pengine/test10/stopped-monitor-22.summary
@@ -6,8 +6,8 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	FAILED ( disabled ) [ node1 node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node1)
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node1 )   due to node availability
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/target-1.summary b/pengine/test10/target-1.summary
index 12bbe4e..6044338 100644
--- a/pengine/test10/target-1.summary
+++ b/pengine/test10/target-1.summary
@@ -11,7 +11,7 @@ Online: [ c001n01 c001n02 c001n03 c001n08 ]
  rsc_c001n01	(ocf::heartbeat:IPaddr):	Started c001n01
 
 Transition Summary:
- * Stop    rsc_c001n08	(c001n08)
+ * Stop       rsc_c001n08     ( c001n08 )   due to node availability
 
 Executing cluster transition:
  * Resource action: DcIPaddr        monitor on c001n08
diff --git a/pengine/test10/target-2.summary b/pengine/test10/target-2.summary
index a440494..6e83fdc 100644
--- a/pengine/test10/target-2.summary
+++ b/pengine/test10/target-2.summary
@@ -10,7 +10,7 @@ Online: [ c001n01 c001n02 c001n03 c001n08 ]
  rsc_c001n01	(ocf::heartbeat:IPaddr):	Started c001n01
 
 Transition Summary:
- * Stop    rsc_c001n08	(c001n08)
+ * Stop       rsc_c001n08     ( c001n08 )   due to node availability
 
 Executing cluster transition:
  * Resource action: DcIPaddr        monitor on c001n08
diff --git a/pengine/test10/ticket-clone-21.summary b/pengine/test10/ticket-clone-21.summary
index 6b18cfa..1dde14b 100644
--- a/pengine/test10/ticket-clone-21.summary
+++ b/pengine/test10/ticket-clone-21.summary
@@ -9,7 +9,7 @@ Online: [ node1 node2 ]
 Transition Summary:
  * Fence (reboot) node2 'deadman ticket was lost'
  * Fence (reboot) node1 'deadman ticket was lost'
- * Stop    rsc_stonith	(node1)
+ * Stop       rsc_stonith     ( node1 )   due to node availability
  * Stop    rsc1:0	(node1)  	due to node availability
  * Stop    rsc1:1	(node2)  	due to node availability
 
diff --git a/pengine/test10/ticket-clone-9.summary b/pengine/test10/ticket-clone-9.summary
index 6b18cfa..1dde14b 100644
--- a/pengine/test10/ticket-clone-9.summary
+++ b/pengine/test10/ticket-clone-9.summary
@@ -9,7 +9,7 @@ Online: [ node1 node2 ]
 Transition Summary:
  * Fence (reboot) node2 'deadman ticket was lost'
  * Fence (reboot) node1 'deadman ticket was lost'
- * Stop    rsc_stonith	(node1)
+ * Stop       rsc_stonith     ( node1 )   due to node availability
  * Stop    rsc1:0	(node1)  	due to node availability
  * Stop    rsc1:1	(node2)  	due to node availability
 
diff --git a/pengine/test10/ticket-primitive-14.summary b/pengine/test10/ticket-primitive-14.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-14.summary
+++ b/pengine/test10/ticket-primitive-14.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-15.summary b/pengine/test10/ticket-primitive-15.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-15.summary
+++ b/pengine/test10/ticket-primitive-15.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-17.summary b/pengine/test10/ticket-primitive-17.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-17.summary
+++ b/pengine/test10/ticket-primitive-17.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-18.summary b/pengine/test10/ticket-primitive-18.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-18.summary
+++ b/pengine/test10/ticket-primitive-18.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-20.summary b/pengine/test10/ticket-primitive-20.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-20.summary
+++ b/pengine/test10/ticket-primitive-20.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-21.summary b/pengine/test10/ticket-primitive-21.summary
index 9b91672..6c0f1ba 100644
--- a/pengine/test10/ticket-primitive-21.summary
+++ b/pengine/test10/ticket-primitive-21.summary
@@ -7,7 +7,7 @@ Online: [ node1 node2 ]
 
 Transition Summary:
  * Fence (reboot) node2 'deadman ticket was lost'
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Fencing node2 (reboot)
diff --git a/pengine/test10/ticket-primitive-23.summary b/pengine/test10/ticket-primitive-23.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-23.summary
+++ b/pengine/test10/ticket-primitive-23.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-3.summary b/pengine/test10/ticket-primitive-3.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-3.summary
+++ b/pengine/test10/ticket-primitive-3.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-6.summary b/pengine/test10/ticket-primitive-6.summary
index fa7558a..b31757b 100644
--- a/pengine/test10/ticket-primitive-6.summary
+++ b/pengine/test10/ticket-primitive-6.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node2
diff --git a/pengine/test10/ticket-primitive-9.summary b/pengine/test10/ticket-primitive-9.summary
index 9b91672..6c0f1ba 100644
--- a/pengine/test10/ticket-primitive-9.summary
+++ b/pengine/test10/ticket-primitive-9.summary
@@ -7,7 +7,7 @@ Online: [ node1 node2 ]
 
 Transition Summary:
  * Fence (reboot) node2 'deadman ticket was lost'
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
 
 Executing cluster transition:
  * Fencing node2 (reboot)
diff --git a/pengine/test10/ticket-rsc-sets-10.summary b/pengine/test10/ticket-rsc-sets-10.summary
index 8ef03e0..0a36d45 100644
--- a/pengine/test10/ticket-rsc-sets-10.summary
+++ b/pengine/test10/ticket-rsc-sets-10.summary
@@ -14,7 +14,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (                 node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
  * Stop    rsc4:0	(node1)  	due to node availability
diff --git a/pengine/test10/ticket-rsc-sets-12.summary b/pengine/test10/ticket-rsc-sets-12.summary
index 616a2a2..fd22d77 100644
--- a/pengine/test10/ticket-rsc-sets-12.summary
+++ b/pengine/test10/ticket-rsc-sets-12.summary
@@ -13,7 +13,7 @@ Online: [ node1 node2 ]
      Slaves: [ node1 node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1    ( node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
 
diff --git a/pengine/test10/ticket-rsc-sets-13.summary b/pengine/test10/ticket-rsc-sets-13.summary
index 8ef03e0..0a36d45 100644
--- a/pengine/test10/ticket-rsc-sets-13.summary
+++ b/pengine/test10/ticket-rsc-sets-13.summary
@@ -14,7 +14,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (                 node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
  * Stop    rsc4:0	(node1)  	due to node availability
diff --git a/pengine/test10/ticket-rsc-sets-14.summary b/pengine/test10/ticket-rsc-sets-14.summary
index 8ef03e0..0a36d45 100644
--- a/pengine/test10/ticket-rsc-sets-14.summary
+++ b/pengine/test10/ticket-rsc-sets-14.summary
@@ -14,7 +14,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (                 node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
  * Stop    rsc4:0	(node1)  	due to node availability
diff --git a/pengine/test10/ticket-rsc-sets-3.summary b/pengine/test10/ticket-rsc-sets-3.summary
index 8ef03e0..0a36d45 100644
--- a/pengine/test10/ticket-rsc-sets-3.summary
+++ b/pengine/test10/ticket-rsc-sets-3.summary
@@ -14,7 +14,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (                 node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
  * Stop    rsc4:0	(node1)  	due to node availability
diff --git a/pengine/test10/ticket-rsc-sets-7.summary b/pengine/test10/ticket-rsc-sets-7.summary
index 8ef03e0..0a36d45 100644
--- a/pengine/test10/ticket-rsc-sets-7.summary
+++ b/pengine/test10/ticket-rsc-sets-7.summary
@@ -14,7 +14,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (                 node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
  * Stop    rsc4:0	(node1)  	due to node availability
diff --git a/pengine/test10/ticket-rsc-sets-9.summary b/pengine/test10/ticket-rsc-sets-9.summary
index 8ef03e0..0a36d45 100644
--- a/pengine/test10/ticket-rsc-sets-9.summary
+++ b/pengine/test10/ticket-rsc-sets-9.summary
@@ -14,7 +14,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (                 node2 )   due to node availability
  * Stop    rsc2	(node1)  	due to node availability
  * Stop    rsc3	(node1)  	due to node availability
  * Stop    rsc4:0	(node1)  	due to node availability
diff --git a/pengine/test10/unfence-definition.dot b/pengine/test10/unfence-definition.dot
index c16bdb5..3bc29d3 100644
--- a/pengine/test10/unfence-definition.dot
+++ b/pengine/test10/unfence-definition.dot
@@ -58,7 +58,6 @@ digraph "g" {
 "fencing_delete_0 virt-1" -> "fencing_start_0 virt-1" [ style = bold]
 "fencing_delete_0 virt-1" [ style=bold color="green" fontcolor="black"]
 "fencing_monitor_0 virt-3" -> "fencing_start_0 virt-1" [ style = bold]
-"fencing_monitor_0 virt-3" -> "fencing_stop_0 virt-1" [ style = bold]
 "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "fencing_start_0 virt-1" [ style=bold color="green" fontcolor="black"]
 "fencing_stop_0 virt-1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/unfence-definition.exp b/pengine/test10/unfence-definition.exp
index 4e619fe..b1e241a 100644
--- a/pengine/test10/unfence-definition.exp
+++ b/pengine/test10/unfence-definition.exp
@@ -50,11 +50,7 @@
         <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
diff --git a/pengine/test10/unfence-parameters.dot b/pengine/test10/unfence-parameters.dot
index ccbddbd..ce006c4 100644
--- a/pengine/test10/unfence-parameters.dot
+++ b/pengine/test10/unfence-parameters.dot
@@ -56,7 +56,6 @@ digraph "g" {
 "dlm_stop_0 virt-1" -> "stonith 'on' virt-1" [ style = bold]
 "dlm_stop_0 virt-1" [ style=bold color="green" fontcolor="black"]
 "fencing_monitor_0 virt-3" -> "fencing_start_0 virt-1" [ style = bold]
-"fencing_monitor_0 virt-3" -> "fencing_stop_0 virt-1" [ style = bold]
 "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "fencing_start_0 virt-1" [ style=bold color="green" fontcolor="black"]
 "fencing_stop_0 virt-1" -> "all_stopped" [ style = bold]
diff --git a/pengine/test10/unfence-parameters.exp b/pengine/test10/unfence-parameters.exp
index 8022591..b8053c7 100644
--- a/pengine/test10/unfence-parameters.exp
+++ b/pengine/test10/unfence-parameters.exp
@@ -6,11 +6,7 @@
         <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
diff --git a/pengine/test10/unfence-parameters.summary b/pengine/test10/unfence-parameters.summary
index b9f4953..5b582d9 100644
--- a/pengine/test10/unfence-parameters.summary
+++ b/pengine/test10/unfence-parameters.summary
@@ -15,7 +15,7 @@ Transition Summary:
  * Fence (reboot) virt-4 'node is unclean'
  * Fence (on) virt-3 'Required by dlm:2'
  * Fence (on) virt-1 'Device parameters changed (reload)'
- * Restart    fencing     ( virt-1 )  
+ * Restart    fencing     ( virt-1 )   due to resource definition change
  * Restart    dlm:0       ( virt-1 )   due to required stonith
  * Start   dlm:2	(virt-3)
  * Restart    clvmd:0     ( virt-1 )   due to required stonith
@@ -23,13 +23,13 @@ Transition Summary:
  * Start   clvmd:2	(virt-3)
 
 Executing cluster transition:
+ * Resource action: fencing         stop on virt-1
  * Resource action: fencing         monitor on virt-3
  * Resource action: clvmd           monitor on virt-2
  * Pseudo action:   clvmd-clone_stop_0
  * Fencing virt-4 (reboot)
  * Pseudo action:   stonith_complete
  * Fencing virt-3 (on)
- * Resource action: fencing         stop on virt-1
  * Resource action: dlm             monitor on virt-3
  * Resource action: clvmd           stop on virt-1
  * Resource action: clvmd           monitor on virt-3
diff --git a/pengine/test10/unmanaged-block-restart.summary b/pengine/test10/unmanaged-block-restart.summary
index d7725c9..87b5e29 100644
--- a/pengine/test10/unmanaged-block-restart.summary
+++ b/pengine/test10/unmanaged-block-restart.summary
@@ -10,8 +10,8 @@ Online: [ yingying.site ]
 
 Transition Summary:
  * Start   rsc1	(yingying.site)
- * Stop       rsc2    ( yingying.site )   due to required rsc1 start (blocked)
- * Stop       rsc3    ( yingying.site )   due to required rsc2 start (blocked)
+ * Stop       rsc2    ( yingying.site )   due to unrunnable rsc3 stop (blocked)
+ * Stop       rsc3    ( yingying.site )   due to required rsc2 stop (blocked)
 
 Executing cluster transition:
  * Pseudo action:   group1_stop_0
diff --git a/pengine/test10/utilization-order1.summary b/pengine/test10/utilization-order1.summary
index 282601d..3b93487 100644
--- a/pengine/test10/utilization-order1.summary
+++ b/pengine/test10/utilization-order1.summary
@@ -7,7 +7,7 @@ Online: [ node1 node2 ]
 
 Transition Summary:
  * Start   rsc2	(node1)
- * Stop    rsc1	(node1)
+ * Stop       rsc1    ( node1 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
diff --git a/pengine/test10/utilization-order2.summary b/pengine/test10/utilization-order2.summary
index ad3fd38..63bbbe4 100644
--- a/pengine/test10/utilization-order2.summary
+++ b/pengine/test10/utilization-order2.summary
@@ -12,7 +12,7 @@ Transition Summary:
  * Start   rsc4	(node1)
  * Move       rsc3       ( node1 -> node2 )  
  * Stop    rsc2:0	(node1)  	due to node availability
- * Stop    rsc1	(node2)
+ * Stop       rsc1       (          node2 )   due to node availability
 
 Executing cluster transition:
  * Resource action: rsc3            stop on node1
diff --git a/pengine/test10/utilization-order4.summary b/pengine/test10/utilization-order4.summary
index 04c5f93..144ce40 100644
--- a/pengine/test10/utilization-order4.summary
+++ b/pengine/test10/utilization-order4.summary
@@ -16,7 +16,7 @@ Online: [ deglxen001 ]
 
 Transition Summary:
  * Migrate    degllx62-vm             ( deglxen002 -> deglxen001 )  
- * Stop    degllx61-vm	(deglxen001)
+ * Stop       degllx61-vm             (               deglxen001 )   due to node availability
  * Stop    nfs-xen_config:1	(deglxen002)  	due to node availability
  * Stop    nfs-xen_swapfiles:1	(deglxen002)  	due to node availability
  * Stop    nfs-xen_images:1	(deglxen002)  	due to node availability
diff --git a/pengine/test10/whitebox-migrate1.dot b/pengine/test10/whitebox-migrate1.dot
index 29874e6..500dc34 100644
--- a/pengine/test10/whitebox-migrate1.dot
+++ b/pengine/test10/whitebox-migrate1.dot
@@ -28,7 +28,6 @@
 "rhel7-node1_migrate_to_0 rhel7-node2" [ style=bold color="green" fontcolor="black"]
 "rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_migrate_to_0 rhel7-node2" [ style = bold]
 "rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold]
-"rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_stop_0 rhel7-node2" [ style = bold]
 "rhel7-node1_monitor_0 rhel7-node3" [ style=bold color="green" fontcolor="black"]
 "rhel7-node1_monitor_30000 rhel7-node3" [ style=bold color="green" fontcolor="black"]
 "rhel7-node1_start_0 rhel7-node3" -> "rhel7-node1_monitor_30000 rhel7-node3" [ style = bold]
diff --git a/pengine/test10/whitebox-migrate1.exp b/pengine/test10/whitebox-migrate1.exp
index 1b6c451..03e8b83 100644
--- a/pengine/test10/whitebox-migrate1.exp
+++ b/pengine/test10/whitebox-migrate1.exp
@@ -207,9 +207,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="rhel7-node1_monitor_0" on_node="rhel7-node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
         <rsc_op id="40" operation="migrate_from" operation_key="rhel7-node1_migrate_from_0" on_node="rhel7-node3" on_node_uuid="3"/>
       </trigger>
     </inputs>
diff --git a/pengine/test10/whitebox-move.dot b/pengine/test10/whitebox-move.dot
index ed06b7c..56f2fdd 100644
--- a/pengine/test10/whitebox-move.dot
+++ b/pengine/test10/whitebox-move.dot
@@ -1,6 +1,5 @@
 digraph "g" {
 "A_monitor_0 lxc2" -> "A_start_0 lxc1" [ style = bold]
-"A_monitor_0 lxc2" -> "A_stop_0 lxc1" [ style = bold]
 "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "A_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
 "A_start_0 lxc1" -> "A_monitor_10000 lxc1" [ style = bold]
diff --git a/pengine/test10/whitebox-move.exp b/pengine/test10/whitebox-move.exp
index 6f00275..cb596bd 100644
--- a/pengine/test10/whitebox-move.exp
+++ b/pengine/test10/whitebox-move.exp
@@ -155,11 +155,7 @@
         <attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="A_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="11">
     <action_set>
diff --git a/pengine/test10/whitebox-move.summary b/pengine/test10/whitebox-move.summary
index 23bc5de..95e9680 100644
--- a/pengine/test10/whitebox-move.summary
+++ b/pengine/test10/whitebox-move.summary
@@ -18,11 +18,11 @@ Transition Summary:
 
 Executing cluster transition:
  * Pseudo action:   M-clone_stop_0
+ * Resource action: A               stop on lxc1
  * Resource action: A               monitor on lxc2
  * Resource action: M               stop on lxc1
  * Pseudo action:   M-clone_stopped_0
  * Pseudo action:   M-clone_start_0
- * Resource action: A               stop on lxc1
  * Resource action: lxc1            stop on 18node1
  * Resource action: container1      stop on 18node1
  * Pseudo action:   all_stopped
diff --git a/pengine/test10/whitebox-ms-ordering-move.dot b/pengine/test10/whitebox-ms-ordering-move.dot
index e6b5406..641dbca 100644
--- a/pengine/test10/whitebox-ms-ordering-move.dot
+++ b/pengine/test10/whitebox-ms-ordering-move.dot
@@ -45,16 +45,12 @@ digraph "g" {
 "lxc-ms_stop_0 lxc1" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-2" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-3" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-4" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold]
-"lxc1_monitor_0 rhel7-5" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"]
 "lxc1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
diff --git a/pengine/test10/whitebox-ms-ordering-move.exp b/pengine/test10/whitebox-ms-ordering-move.exp
index a8ffa64..aabcaa7 100644
--- a/pengine/test10/whitebox-ms-ordering-move.exp
+++ b/pengine/test10/whitebox-ms-ordering-move.exp
@@ -372,18 +372,6 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="40" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="42" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="44" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
         <rsc_op id="115" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-1"/>
       </trigger>
       <trigger>
diff --git a/pengine/test10/whitebox-orphan-ms.summary b/pengine/test10/whitebox-orphan-ms.summary
index 2b0234b..71f87c5 100644
--- a/pengine/test10/whitebox-orphan-ms.summary
+++ b/pengine/test10/whitebox-orphan-ms.summary
@@ -30,8 +30,8 @@ Transition Summary:
  * Move       FencingFail     ( 18node3 -> 18node1 )  
  * Stop    container2	(18node1)  	due to node availability
  * Stop    lxc1	(18node1)  	due to node availability
- * Stop       lxc-ms          (        Master lxc1 )  
- * Stop       lxc-ms          (        Master lxc2 )  
+ * Stop       lxc-ms          (        Master lxc1 )   due to node availability
+ * Stop       lxc-ms          (        Master lxc2 )   due to node availability
  * Stop    lxc2	(18node1)  	due to node availability
  * Stop    container1	(18node1)  	due to node availability
 
diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot
index 48e167f..3e34f16 100644
--- a/pengine/test10/whitebox-orphaned.dot
+++ b/pengine/test10/whitebox-orphaned.dot
@@ -1,7 +1,6 @@
  digraph "g" {
 "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_monitor_0 lxc2" -> "B_start_0 lxc2" [ style = bold]
-"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold]
 "B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_start_0 lxc2" -> "B_monitor_10000 lxc2" [ style = bold]
diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp
index b267010..2255fec 100644
--- a/pengine/test10/whitebox-orphaned.exp
+++ b/pengine/test10/whitebox-orphaned.exp
@@ -80,11 +80,7 @@
         <attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="20" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="7">
     <action_set>
diff --git a/pengine/test10/whitebox-orphaned.summary b/pengine/test10/whitebox-orphaned.summary
index e0928b1..f1cc8cb 100644
--- a/pengine/test10/whitebox-orphaned.summary
+++ b/pengine/test10/whitebox-orphaned.summary
@@ -24,24 +24,24 @@ Transition Summary:
 Executing cluster transition:
  * Pseudo action:   M-clone_stop_0
  * Resource action: A               monitor on lxc2
+ * Resource action: B               stop on lxc1
  * Resource action: B               monitor on lxc2
  * Resource action: D               monitor on lxc2
  * Cluster action:  clear_failcount for container1 on 18node2
  * Cluster action:  clear_failcount for lxc1 on 18node2
  * Resource action: M               stop on lxc1
  * Pseudo action:   M-clone_stopped_0
- * Resource action: B               stop on lxc1
+ * Resource action: B               start on lxc2
  * Resource action: lxc1            stop on 18node2
  * Resource action: lxc1            delete on 18node3
  * Resource action: lxc1            delete on 18node2
  * Resource action: lxc1            delete on 18node1
- * Resource action: B               start on lxc2
+ * Resource action: B               monitor=10000 on lxc2
  * Resource action: container1      stop on 18node2
  * Resource action: container1      delete on 18node3
  * Resource action: container1      delete on 18node2
  * Resource action: container1      delete on 18node1
  * Pseudo action:   all_stopped
- * Resource action: B               monitor=10000 on lxc2
 
 Revised cluster status:
 Online: [ 18node1 18node2 18node3 ]
diff --git a/pengine/test10/whitebox-start.dot b/pengine/test10/whitebox-start.dot
index 28f747a..d6b6753 100644
--- a/pengine/test10/whitebox-start.dot
+++ b/pengine/test10/whitebox-start.dot
@@ -1,6 +1,5 @@
 digraph "g" {
 "A_monitor_0 lxc2" -> "A_start_0 lxc1" [ style = bold]
-"A_monitor_0 lxc2" -> "A_stop_0 18node1" [ style = bold]
 "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "A_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
 "A_start_0 lxc1" -> "A_monitor_10000 lxc1" [ style = bold]
diff --git a/pengine/test10/whitebox-start.exp b/pengine/test10/whitebox-start.exp
index 360b8a7..f3c6879 100644
--- a/pengine/test10/whitebox-start.exp
+++ b/pengine/test10/whitebox-start.exp
@@ -111,11 +111,7 @@
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="A_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
diff --git a/pengine/test10/whitebox-start.summary b/pengine/test10/whitebox-start.summary
index 01a1b74..b706193 100644
--- a/pengine/test10/whitebox-start.summary
+++ b/pengine/test10/whitebox-start.summary
@@ -24,20 +24,20 @@ Transition Summary:
 Executing cluster transition:
  * Resource action: container1      start on 18node1
  * Pseudo action:   M-clone_start_0
+ * Resource action: A               stop on 18node1
  * Resource action: A               monitor on lxc2
  * Resource action: B               stop on lxc2
  * Resource action: D               monitor on lxc2
  * Resource action: lxc1            start on 18node1
+ * Pseudo action:   all_stopped
  * Resource action: M               start on lxc1
  * Pseudo action:   M-clone_running_0
- * Resource action: A               stop on 18node1
+ * Resource action: A               start on lxc1
  * Resource action: B               start on 18node3
  * Resource action: lxc1            monitor=30000 on 18node1
- * Pseudo action:   all_stopped
  * Resource action: M               monitor=10000 on lxc1
- * Resource action: A               start on lxc1
- * Resource action: B               monitor=10000 on 18node3
  * Resource action: A               monitor=10000 on lxc1
+ * Resource action: B               monitor=10000 on 18node3
 
 Revised cluster status:
 Online: [ 18node1 18node2 18node3 ]
diff --git a/pengine/test10/whitebox-stop.dot b/pengine/test10/whitebox-stop.dot
index 0ecdcba..0eec273 100644
--- a/pengine/test10/whitebox-stop.dot
+++ b/pengine/test10/whitebox-stop.dot
@@ -1,7 +1,6 @@
 digraph "g" {
 "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_monitor_0 lxc2" -> "B_start_0 lxc2" [ style = bold]
-"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold]
 "B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_start_0 lxc2" -> "B_monitor_10000 lxc2" [ style = bold]
diff --git a/pengine/test10/whitebox-stop.exp b/pengine/test10/whitebox-stop.exp
index 84a5288..598ada5 100644
--- a/pengine/test10/whitebox-stop.exp
+++ b/pengine/test10/whitebox-stop.exp
@@ -93,11 +93,7 @@
         <attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="14" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
diff --git a/pengine/test10/whitebox-stop.summary b/pengine/test10/whitebox-stop.summary
index 44e570f..55a83c7 100644
--- a/pengine/test10/whitebox-stop.summary
+++ b/pengine/test10/whitebox-stop.summary
@@ -23,16 +23,16 @@ Transition Summary:
 Executing cluster transition:
  * Pseudo action:   M-clone_stop_0
  * Resource action: A               monitor on lxc2
+ * Resource action: B               stop on lxc1
  * Resource action: B               monitor on lxc2
  * Resource action: D               monitor on lxc2
  * Resource action: M               stop on lxc1
  * Pseudo action:   M-clone_stopped_0
- * Resource action: B               stop on lxc1
+ * Resource action: B               start on lxc2
  * Resource action: lxc1            stop on 18node2
  * Resource action: container1      stop on 18node2
- * Resource action: B               start on lxc2
- * Pseudo action:   all_stopped
  * Resource action: B               monitor=10000 on lxc2
+ * Pseudo action:   all_stopped
 
 Revised cluster status:
 Online: [ 18node1 18node2 18node3 ]
-- 
1.8.3.1