From cacbac0677bb5285f16bdb16272dbbe02a7984d2 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 23 Oct 2017 12:06:46 +1100
Subject: [PATCH 1/6] Fix: PE: Exclude resources and nodes from the
 symmetric_default constraint in some circumstances

This is particularly relevant to bundles where only specific nodes
are allowed to a particular resource.  Previously, even if we set the
tuple up correctly during container_unpack(), common_unpack() would
re-add the full node set afterwards recursively via the parent.

Similarly, the bundle "nodes" are not eligable for running any other
resource than the one container_unpack() assigned it and there is no
reason to add it to their allowed_nodes list.

Keeping the allowed_nodes list concise also ensures crm_resource
--cleanup does the bare minimum necessary when the resource is in an
unknown state.
---
 lib/pengine/container.c |  9 +++++++++
 lib/pengine/utils.c     | 16 +++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/pengine/container.c b/lib/pengine/container.c
index 75c5961..b66c57d 100644
--- a/lib/pengine/container.c
+++ b/lib/pengine/container.c
@@ -463,8 +463,15 @@ create_remote_resource(
         tuple->node->rsc_discover_mode = pe_discover_exclusive;
 
         /* Ensure the node shows up as allowed and with the correct discovery set */
+        g_hash_table_destroy(tuple->child->allowed_nodes);
+        tuple->child->allowed_nodes = g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, g_hash_destroy_str);
         g_hash_table_insert(tuple->child->allowed_nodes, (gpointer) tuple->node->details->id, node_copy(tuple->node));
 
+        {
+            node_t *copy = node_copy(tuple->node);
+            copy->weight = -INFINITY;
+            g_hash_table_insert(tuple->child->parent->allowed_nodes, (gpointer) tuple->node->details->id, copy);
+        }
         if (common_unpack(xml_remote, &tuple->remote, parent, data_set) == FALSE) {
             return FALSE;
         }
@@ -478,6 +485,7 @@ create_remote_resource(
         }
 
         tuple->node->details->remote_rsc = tuple->remote;
+        tuple->remote->container = tuple->docker; // Ensures is_container_remote_node() functions correctly immediately
 
         /* #kind is irrelevant to bundles since it is only used in location
          * constraint rules, and those don't matter for resources inside
@@ -761,6 +769,7 @@ container_unpack(resource_t * rsc, pe_working_set_t * data_set)
         for(childIter = container_data->child->children; childIter != NULL; childIter = childIter->next) {
             container_grouping_t *tuple = calloc(1, sizeof(container_grouping_t));
             tuple->child = childIter->data;
+            tuple->child->exclusive_discover = TRUE;
             tuple->offset = lpc++;
 
             // Ensure the child's notify gets set based on the underlying primitive's value
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 780eb17..d9cace2 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -1447,7 +1447,21 @@ resource_node_score(resource_t * rsc, node_t * node, int score, const char *tag)
 {
     node_t *match = NULL;
 
-    if (rsc->children) {
+    if(rsc->exclusive_discover && safe_str_eq(tag, "symmetric_default")) {
+        /* A terrible implementation via string comparision but
+         * exclusive resources should not have the symmetric_default
+         * constraint applied to them.
+         */
+        return;
+
+    } else if(node->rsc_discover_mode == pe_discover_never && safe_str_eq(tag, "symmetric_default")) {
+        /* Another terrible implementation via string comparision but
+         * exclusive node should also not be included in the
+         * symmetric_default constraint.
+         */
+        return;
+
+    } else if (rsc->children) {
         GListPtr gIter = rsc->children;
 
         for (; gIter != NULL; gIter = gIter->next) {
-- 
1.8.3.1


From f764f368e28b5713cf5061844869b78e1f8a5384 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 23 Oct 2017 13:51:41 +1100
Subject: [PATCH 2/6] Test: PE: Exclude resources and nodes from the
 symmetric_default constraint in some circumstances

---
 pengine/test10/bundle-nested-colocation.scores     | 159 ----
 pengine/test10/bundle-order-fencing.exp            |  44 +-
 pengine/test10/bundle-order-fencing.scores         | 825 +------------------
 pengine/test10/bundle-order-partial-start-2.exp    |   6 +-
 pengine/test10/bundle-order-partial-start-2.scores | 148 +---
 pengine/test10/bundle-order-partial-start.exp      |   6 +-
 pengine/test10/bundle-order-partial-start.scores   | 148 +---
 pengine/test10/bundle-order-partial-stop.exp       |  10 +-
 pengine/test10/bundle-order-partial-stop.scores    | 132 +--
 pengine/test10/bundle-order-startup-clone-2.exp    |  30 +-
 pengine/test10/bundle-order-startup-clone-2.scores | 315 -------
 pengine/test10/bundle-order-startup-clone.exp      |   4 +-
 pengine/test10/bundle-order-startup-clone.scores   |  49 --
 pengine/test10/bundle-order-startup.exp            |   4 +-
 pengine/test10/bundle-order-startup.scores         | 132 +--
 pengine/test10/bundle-order-stop-clone.scores      | 318 -------
 pengine/test10/bundle-order-stop.exp               |  10 +-
 pengine/test10/bundle-order-stop.scores            | 132 +--
 pengine/test10/bundle-probe-order-1.scores         |  84 --
 pengine/test10/bundle-probe-order-2.scores         |  84 --
 pengine/test10/bundle-probe-order-3.scores         |  84 --
 pengine/test10/remote-fence-unclean-3.scores       | 912 +--------------------
 22 files changed, 105 insertions(+), 3531 deletions(-)

diff --git a/pengine/test10/bundle-nested-colocation.scores b/pengine/test10/bundle-nested-colocation.scores
index 83d776d..70a500c 100644
--- a/pengine/test10/bundle-nested-colocation.scores
+++ b/pengine/test10/bundle-nested-colocation.scores
@@ -12,41 +12,8 @@ clone_color: rabbitmq-bundle-clone allocation score on overcloud-rabbit-2: -INFI
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: 0
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: 0
-clone_color: rabbitmq:0 allocation score on overcloud-controller-0: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-controller-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-controller-2: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-galera-0: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-galera-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-galera-2: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-rabbit-0: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-rabbit-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-rabbit-2: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-controller-0: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-controller-1: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-controller-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-galera-0: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-galera-1: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-galera-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-rabbit-0: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-rabbit-1: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-rabbit-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-controller-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-controller-1: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-controller-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-galera-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-galera-1: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-galera-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-rabbit-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-rabbit-1: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-rabbit-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
 container_color: galera-bundle allocation score on overcloud-controller-0: -INFINITY
 container_color: galera-bundle allocation score on overcloud-controller-1: -INFINITY
@@ -57,9 +24,6 @@ container_color: galera-bundle allocation score on overcloud-galera-2: 0
 container_color: galera-bundle allocation score on overcloud-rabbit-0: -INFINITY
 container_color: galera-bundle allocation score on overcloud-rabbit-1: -INFINITY
 container_color: galera-bundle allocation score on overcloud-rabbit-2: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-controller-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-controller-1: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-controller-2: -INFINITY
@@ -69,9 +33,6 @@ container_color: galera-bundle-docker-0 allocation score on overcloud-galera-2:
 container_color: galera-bundle-docker-0 allocation score on overcloud-rabbit-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-rabbit-1: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-rabbit-2: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-controller-1: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-controller-2: -INFINITY
@@ -81,9 +42,6 @@ container_color: galera-bundle-docker-1 allocation score on overcloud-galera-2:
 container_color: galera-bundle-docker-1 allocation score on overcloud-rabbit-0: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-rabbit-1: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-rabbit-2: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-controller-2: -INFINITY
@@ -93,9 +51,6 @@ container_color: galera-bundle-docker-2 allocation score on overcloud-galera-2:
 container_color: galera-bundle-docker-2 allocation score on overcloud-rabbit-0: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-rabbit-1: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-rabbit-2: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle allocation score on overcloud-controller-0: -INFINITY
 container_color: rabbitmq-bundle allocation score on overcloud-controller-1: -INFINITY
 container_color: rabbitmq-bundle allocation score on overcloud-controller-2: -INFINITY
@@ -105,9 +60,6 @@ container_color: rabbitmq-bundle allocation score on overcloud-galera-2: -INFINI
 container_color: rabbitmq-bundle allocation score on overcloud-rabbit-0: 1
 container_color: rabbitmq-bundle allocation score on overcloud-rabbit-1: 1
 container_color: rabbitmq-bundle allocation score on overcloud-rabbit-2: 1
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-0 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-0 allocation score on overcloud-controller-2: 0
@@ -117,9 +69,6 @@ container_color: rabbitmq-bundle-0 allocation score on overcloud-galera-2: 0
 container_color: rabbitmq-bundle-0 allocation score on overcloud-rabbit-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on overcloud-rabbit-1: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on overcloud-rabbit-2: -INFINITY
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-1 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-1 allocation score on overcloud-controller-2: 0
@@ -129,9 +78,6 @@ container_color: rabbitmq-bundle-1 allocation score on overcloud-galera-2: 0
 container_color: rabbitmq-bundle-1 allocation score on overcloud-rabbit-0: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on overcloud-rabbit-1: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on overcloud-rabbit-2: -INFINITY
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-2 allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-2 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-2 allocation score on overcloud-controller-2: 0
@@ -141,9 +87,6 @@ container_color: rabbitmq-bundle-2 allocation score on overcloud-galera-2: 0
 container_color: rabbitmq-bundle-2 allocation score on overcloud-rabbit-0: -INFINITY
 container_color: rabbitmq-bundle-2 allocation score on overcloud-rabbit-1: -INFINITY
 container_color: rabbitmq-bundle-2 allocation score on overcloud-rabbit-2: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-clone allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-clone allocation score on overcloud-controller-2: 0
@@ -165,9 +108,6 @@ container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-galera-2
 container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-rabbit-0: INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-rabbit-1: 1
 container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-rabbit-2: 1
-container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-1: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-2: -INFINITY
@@ -177,9 +117,6 @@ container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-galera-2
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-rabbit-0: 1
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-rabbit-1: INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-rabbit-2: 1
-container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-2: -INFINITY
@@ -189,44 +126,8 @@ container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-galera-2
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-rabbit-0: 1
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-rabbit-1: 1
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-rabbit-2: INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: rabbitmq:0 allocation score on overcloud-controller-0: 0
-container_color: rabbitmq:0 allocation score on overcloud-controller-1: 0
-container_color: rabbitmq:0 allocation score on overcloud-controller-2: 0
-container_color: rabbitmq:0 allocation score on overcloud-galera-0: 0
-container_color: rabbitmq:0 allocation score on overcloud-galera-1: 0
-container_color: rabbitmq:0 allocation score on overcloud-galera-2: 0
-container_color: rabbitmq:0 allocation score on overcloud-rabbit-0: 0
-container_color: rabbitmq:0 allocation score on overcloud-rabbit-1: 0
-container_color: rabbitmq:0 allocation score on overcloud-rabbit-2: 0
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: 500
-container_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: rabbitmq:1 allocation score on overcloud-controller-0: 0
-container_color: rabbitmq:1 allocation score on overcloud-controller-1: 0
-container_color: rabbitmq:1 allocation score on overcloud-controller-2: 0
-container_color: rabbitmq:1 allocation score on overcloud-galera-0: 0
-container_color: rabbitmq:1 allocation score on overcloud-galera-1: 0
-container_color: rabbitmq:1 allocation score on overcloud-galera-2: 0
-container_color: rabbitmq:1 allocation score on overcloud-rabbit-0: 0
-container_color: rabbitmq:1 allocation score on overcloud-rabbit-1: 0
-container_color: rabbitmq:1 allocation score on overcloud-rabbit-2: 0
-container_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: 500
-container_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: rabbitmq:2 allocation score on overcloud-controller-0: 0
-container_color: rabbitmq:2 allocation score on overcloud-controller-1: 0
-container_color: rabbitmq:2 allocation score on overcloud-controller-2: 0
-container_color: rabbitmq:2 allocation score on overcloud-galera-0: 0
-container_color: rabbitmq:2 allocation score on overcloud-galera-1: 0
-container_color: rabbitmq:2 allocation score on overcloud-galera-2: 0
-container_color: rabbitmq:2 allocation score on overcloud-rabbit-0: 0
-container_color: rabbitmq:2 allocation score on overcloud-rabbit-1: 0
-container_color: rabbitmq:2 allocation score on overcloud-rabbit-2: 0
-container_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: 500
 native_color: galera-bundle-docker-0 allocation score on overcloud-controller-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on overcloud-controller-1: -INFINITY
@@ -237,9 +138,6 @@ native_color: galera-bundle-docker-0 allocation score on overcloud-galera-2: 0
 native_color: galera-bundle-docker-0 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-controller-1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-controller-2: -INFINITY
@@ -249,9 +147,6 @@ native_color: galera-bundle-docker-1 allocation score on overcloud-galera-2: 0
 native_color: galera-bundle-docker-1 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-controller-2: -INFINITY
@@ -261,9 +156,6 @@ native_color: galera-bundle-docker-2 allocation score on overcloud-galera-2: INF
 native_color: galera-bundle-docker-2 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: overcloud-rabbit-0 allocation score on overcloud-controller-0: INFINITY
 native_color: overcloud-rabbit-0 allocation score on overcloud-controller-1: 0
 native_color: overcloud-rabbit-0 allocation score on overcloud-controller-2: 0
@@ -300,9 +192,6 @@ native_color: rabbitmq-bundle-0 allocation score on overcloud-galera-2: -INFINIT
 native_color: rabbitmq-bundle-0 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on overcloud-controller-0: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on overcloud-controller-1: 0
 native_color: rabbitmq-bundle-1 allocation score on overcloud-controller-2: -INFINITY
@@ -312,9 +201,6 @@ native_color: rabbitmq-bundle-1 allocation score on overcloud-galera-2: -INFINIT
 native_color: rabbitmq-bundle-1 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-controller-2: 0
@@ -324,9 +210,6 @@ native_color: rabbitmq-bundle-2 allocation score on overcloud-galera-2: -INFINIT
 native_color: rabbitmq-bundle-2 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-1: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-2: -INFINITY
@@ -336,9 +219,6 @@ native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-galera-2: -
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-rabbit-0: INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-rabbit-1: -9999
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-rabbit-2: -9999
-native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-1: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-2: -INFINITY
@@ -348,9 +228,6 @@ native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-galera-2: -
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-rabbit-1: INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-rabbit-2: -9999
-native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-2: -INFINITY
@@ -360,42 +237,6 @@ native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-galera-2: -
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-rabbit-0: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-rabbit-1: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-rabbit-2: INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-controller-0: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-controller-1: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-controller-2: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-galera-0: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-galera-1: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-galera-2: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-rabbit-0: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-rabbit-1: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-rabbit-2: -INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-controller-0: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-controller-1: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-controller-2: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-galera-0: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-galera-1: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-galera-2: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-rabbit-0: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-rabbit-1: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-native_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-controller-0: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-controller-1: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-controller-2: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-galera-0: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-galera-1: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-galera-2: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-rabbit-0: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-rabbit-1: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-rabbit-2: -INFINITY
-native_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
index dab0dd4..c4e4ec1 100644
--- a/pengine/test10/bundle-order-fencing.exp
+++ b/pengine/test10/bundle-order-fencing.exp
@@ -632,7 +632,7 @@
     <action_set>
       <rsc_op id="241" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -645,7 +645,7 @@
     <action_set>
       <rsc_op id="240" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -658,7 +658,7 @@
     <action_set>
       <rsc_op id="233" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -700,7 +700,7 @@
   <synapse id="49">
     <action_set>
       <pseudo_event id="141" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -721,7 +721,7 @@
   <synapse id="50">
     <action_set>
       <pseudo_event id="140" operation="demote" operation_key="redis_demote_0" internal_operation_key="redis:0_demote_0">
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -737,7 +737,7 @@
     <action_set>
       <rsc_op id="247" operation="notify" operation_key="redis_post_notify_demote_0" internal_operation_key="redis:1_post_notify_demote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -750,7 +750,7 @@
     <action_set>
       <rsc_op id="246" operation="notify" operation_key="redis_pre_notify_demote_0" internal_operation_key="redis:1_pre_notify_demote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -763,7 +763,7 @@
     <action_set>
       <rsc_op id="243" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -776,7 +776,7 @@
     <action_set>
       <rsc_op id="242" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -789,7 +789,7 @@
     <action_set>
       <rsc_op id="238" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -802,7 +802,7 @@
     <action_set>
       <rsc_op id="235" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -815,7 +815,7 @@
     <action_set>
       <rsc_op id="234" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:1_pre_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -828,7 +828,7 @@
     <action_set>
       <rsc_op id="217" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:1_post_notify_stop_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -872,7 +872,7 @@
     <action_set>
       <rsc_op id="136" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:1_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -912,7 +912,7 @@
     <action_set>
       <rsc_op id="249" operation="notify" operation_key="redis_post_notify_demote_0" internal_operation_key="redis:2_post_notify_demote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -925,7 +925,7 @@
     <action_set>
       <rsc_op id="248" operation="notify" operation_key="redis_pre_notify_demote_0" internal_operation_key="redis:2_pre_notify_demote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -938,7 +938,7 @@
     <action_set>
       <rsc_op id="245" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -951,7 +951,7 @@
     <action_set>
       <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -964,7 +964,7 @@
     <action_set>
       <rsc_op id="239" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -977,7 +977,7 @@
     <action_set>
       <rsc_op id="237" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -990,7 +990,7 @@
     <action_set>
       <rsc_op id="236" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1003,7 +1003,7 @@
     <action_set>
       <rsc_op id="218" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:2_post_notify_stop_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 controller-2 controller-1 controller-0 galera-bundle-2 galera-bundle-1 galera-bundle-0 rabbitmq-bundle-2 rabbitmq-bundle-1" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 redis-bundle-2 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="redis:1" CRM_meta_notify_promote_uname="redis-bundle-1" CRM_meta_notify_slave_resource="redis:1 redis:2" CRM_meta_notify_slave_uname="redis-bundle-1 redis-bundle-2" CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-fencing.scores b/pengine/test10/bundle-order-fencing.scores
index 25c3e79..19649f2 100644
--- a/pengine/test10/bundle-order-fencing.scores
+++ b/pengine/test10/bundle-order-fencing.scores
@@ -6,207 +6,57 @@ clone_color: galera-bundle-master allocation score on controller-2: -INFINITY
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-1: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-2: 0
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: galera:0 allocation score on controller-0: -INFINITY
-clone_color: galera:0 allocation score on controller-1: -INFINITY
-clone_color: galera:0 allocation score on controller-2: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on controller-0: -INFINITY
-clone_color: galera:1 allocation score on controller-1: -INFINITY
-clone_color: galera:1 allocation score on controller-2: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: galera:2 allocation score on controller-0: -INFINITY
-clone_color: galera:2 allocation score on controller-1: -INFINITY
-clone_color: galera:2 allocation score on controller-2: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on controller-0: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on controller-1: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on controller-2: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: 0
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: 0
-clone_color: rabbitmq:0 allocation score on controller-0: -INFINITY
-clone_color: rabbitmq:0 allocation score on controller-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on controller-2: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on controller-0: -INFINITY
-clone_color: rabbitmq:1 allocation score on controller-1: -INFINITY
-clone_color: rabbitmq:1 allocation score on controller-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on controller-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on controller-1: -INFINITY
-clone_color: rabbitmq:2 allocation score on controller-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
 clone_color: redis-bundle-master allocation score on controller-0: -INFINITY
 clone_color: redis-bundle-master allocation score on controller-1: -INFINITY
 clone_color: redis-bundle-master allocation score on controller-2: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-1: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-2: 0
-clone_color: redis:0 allocation score on controller-0: -INFINITY
-clone_color: redis:0 allocation score on controller-1: -INFINITY
-clone_color: redis:0 allocation score on controller-2: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on controller-0: -INFINITY
-clone_color: redis:1 allocation score on controller-1: -INFINITY
-clone_color: redis:1 allocation score on controller-2: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 clone_color: redis:1 allocation score on redis-bundle-1: INFINITY
-clone_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on controller-0: -INFINITY
-clone_color: redis:2 allocation score on controller-1: -INFINITY
-clone_color: redis:2 allocation score on controller-2: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 clone_color: redis:2 allocation score on redis-bundle-2: INFINITY
 container_color: galera-bundle allocation score on controller-0: 0
 container_color: galera-bundle allocation score on controller-1: 0
 container_color: galera-bundle allocation score on controller-2: 0
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on controller-0: INFINITY
 container_color: galera-bundle-0 allocation score on controller-1: 0
 container_color: galera-bundle-0 allocation score on controller-2: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on controller-0: 0
 container_color: galera-bundle-1 allocation score on controller-1: INFINITY
 container_color: galera-bundle-1 allocation score on controller-2: 0
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on controller-0: 0
 container_color: galera-bundle-2 allocation score on controller-1: 0
 container_color: galera-bundle-2 allocation score on controller-2: INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on controller-0: INFINITY
 container_color: galera-bundle-docker-0 allocation score on controller-1: 0
 container_color: galera-bundle-docker-0 allocation score on controller-2: 0
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on controller-0: 0
 container_color: galera-bundle-docker-1 allocation score on controller-1: INFINITY
 container_color: galera-bundle-docker-1 allocation score on controller-2: 0
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on controller-0: 0
 container_color: galera-bundle-docker-2 allocation score on controller-1: 0
 container_color: galera-bundle-docker-2 allocation score on controller-2: INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-master allocation score on controller-0: 0
 container_color: galera-bundle-master allocation score on controller-1: 0
 container_color: galera-bundle-master allocation score on controller-2: 0
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-1: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-2: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera:0 allocation score on controller-0: 0
-container_color: galera:0 allocation score on controller-1: 0
-container_color: galera:0 allocation score on controller-2: 0
 container_color: galera:0 allocation score on galera-bundle-0: INFINITY
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera:1 allocation score on controller-0: 0
-container_color: galera:1 allocation score on controller-1: 0
-container_color: galera:1 allocation score on controller-2: 0
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: INFINITY
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera:1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera:2 allocation score on controller-0: 0
-container_color: galera:2 allocation score on controller-1: 0
-container_color: galera:2 allocation score on controller-2: 0
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: INFINITY
-container_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera:2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: haproxy-bundle allocation score on controller-0: 0
 container_color: haproxy-bundle allocation score on controller-0: 0
 container_color: haproxy-bundle allocation score on controller-0: 0
@@ -228,69 +78,6 @@ container_color: haproxy-bundle allocation score on controller-2: 0
 container_color: haproxy-bundle allocation score on controller-2: 0
 container_color: haproxy-bundle allocation score on controller-2: 0
 container_color: haproxy-bundle allocation score on controller-2: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on controller-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on controller-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on controller-0: -INFINITY
@@ -312,69 +99,6 @@ container_color: haproxy-bundle-docker-0 allocation score on controller-2: -INFI
 container_color: haproxy-bundle-docker-0 allocation score on controller-2: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on controller-2: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on controller-2: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on controller-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on controller-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on controller-0: -INFINITY
@@ -396,69 +120,6 @@ container_color: haproxy-bundle-docker-1 allocation score on controller-2: INFIN
 container_color: haproxy-bundle-docker-1 allocation score on controller-2: INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on controller-2: INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on controller-2: INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on controller-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on controller-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on controller-0: -INFINITY
@@ -480,99 +141,27 @@ container_color: haproxy-bundle-docker-2 allocation score on controller-2: -INFI
 container_color: haproxy-bundle-docker-2 allocation score on controller-2: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on controller-2: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on controller-2: 0
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
 container_color: rabbitmq-bundle allocation score on controller-0: 0
 container_color: rabbitmq-bundle allocation score on controller-1: 0
 container_color: rabbitmq-bundle allocation score on controller-2: 0
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on controller-0: INFINITY
 container_color: rabbitmq-bundle-0 allocation score on controller-1: 0
 container_color: rabbitmq-bundle-0 allocation score on controller-2: 0
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on controller-0: 0
 container_color: rabbitmq-bundle-1 allocation score on controller-1: INFINITY
 container_color: rabbitmq-bundle-1 allocation score on controller-2: 0
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-2 allocation score on controller-0: 0
 container_color: rabbitmq-bundle-2 allocation score on controller-1: 0
 container_color: rabbitmq-bundle-2 allocation score on controller-2: INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on controller-0: 0
 container_color: rabbitmq-bundle-clone allocation score on controller-1: 0
 container_color: rabbitmq-bundle-clone allocation score on controller-2: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: -INFINITY
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on controller-0: INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on controller-1: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on controller-2: 0
@@ -582,164 +171,44 @@ container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-2:
 container_color: rabbitmq-bundle-docker-1 allocation score on controller-0: 0
 container_color: rabbitmq-bundle-docker-1 allocation score on controller-1: INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on controller-2: 0
-container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on controller-0: 0
 container_color: rabbitmq-bundle-docker-2 allocation score on controller-1: 0
 container_color: rabbitmq-bundle-docker-2 allocation score on controller-2: INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: rabbitmq:0 allocation score on controller-0: 0
-container_color: rabbitmq:0 allocation score on controller-1: 0
-container_color: rabbitmq:0 allocation score on controller-2: 0
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-container_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: 0
-container_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: 0
-container_color: rabbitmq:1 allocation score on controller-0: 0
-container_color: rabbitmq:1 allocation score on controller-1: 0
-container_color: rabbitmq:1 allocation score on controller-2: 0
-container_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: 0
 container_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-container_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: 0
-container_color: rabbitmq:2 allocation score on controller-0: 0
-container_color: rabbitmq:2 allocation score on controller-1: 0
-container_color: rabbitmq:2 allocation score on controller-2: 0
-container_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: 0
-container_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: 0
 container_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
 container_color: redis-bundle allocation score on controller-0: 0
 container_color: redis-bundle allocation score on controller-1: 0
 container_color: redis-bundle allocation score on controller-2: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-0 allocation score on controller-0: INFINITY
 container_color: redis-bundle-0 allocation score on controller-1: 0
 container_color: redis-bundle-0 allocation score on controller-2: 0
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-1 allocation score on controller-0: 0
 container_color: redis-bundle-1 allocation score on controller-1: INFINITY
 container_color: redis-bundle-1 allocation score on controller-2: 0
-container_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-2 allocation score on controller-0: 0
 container_color: redis-bundle-2 allocation score on controller-1: 0
 container_color: redis-bundle-2 allocation score on controller-2: INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on controller-0: INFINITY
 container_color: redis-bundle-docker-0 allocation score on controller-1: 0
 container_color: redis-bundle-docker-0 allocation score on controller-2: 0
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-docker-1 allocation score on controller-0: 0
 container_color: redis-bundle-docker-1 allocation score on controller-1: INFINITY
 container_color: redis-bundle-docker-1 allocation score on controller-2: 0
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-docker-2 allocation score on controller-0: 0
 container_color: redis-bundle-docker-2 allocation score on controller-1: 0
 container_color: redis-bundle-docker-2 allocation score on controller-2: INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
 container_color: redis-bundle-master allocation score on controller-0: 0
 container_color: redis-bundle-master allocation score on controller-1: 0
 container_color: redis-bundle-master allocation score on controller-2: 0
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-1: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-2: -INFINITY
-container_color: redis:0 allocation score on controller-0: 0
-container_color: redis:0 allocation score on controller-1: 0
-container_color: redis:0 allocation score on controller-2: 0
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:1 allocation score on controller-0: 0
-container_color: redis:1 allocation score on controller-1: 0
-container_color: redis:1 allocation score on controller-2: 0
-container_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis:1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis:1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 container_color: redis:1 allocation score on redis-bundle-1: INFINITY
-container_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:2 allocation score on controller-0: 0
-container_color: redis:2 allocation score on controller-1: 0
-container_color: redis:2 allocation score on controller-2: 0
-container_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis:2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis:2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 container_color: redis:2 allocation score on redis-bundle-2: INFINITY
 galera:0 promotion score on galera-bundle-0: -1
 galera:1 promotion score on galera-bundle-1: 100
@@ -747,222 +216,66 @@ galera:2 promotion score on galera-bundle-2: 100
 native_color: galera-bundle-0 allocation score on controller-0: INFINITY
 native_color: galera-bundle-0 allocation score on controller-1: 0
 native_color: galera-bundle-0 allocation score on controller-2: 0
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on controller-0: 0
 native_color: galera-bundle-1 allocation score on controller-1: INFINITY
 native_color: galera-bundle-1 allocation score on controller-2: 0
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on controller-0: 0
 native_color: galera-bundle-2 allocation score on controller-1: 0
 native_color: galera-bundle-2 allocation score on controller-2: INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on controller-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on controller-1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on controller-2: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on controller-0: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on controller-1: INFINITY
 native_color: galera-bundle-docker-1 allocation score on controller-2: 0
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on controller-0: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on controller-1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on controller-2: INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera:0 allocation score on controller-0: -INFINITY
-native_color: galera:0 allocation score on controller-1: -INFINITY
-native_color: galera:0 allocation score on controller-2: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera:1 allocation score on controller-0: -INFINITY
-native_color: galera:1 allocation score on controller-1: -INFINITY
-native_color: galera:1 allocation score on controller-2: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera:2 allocation score on controller-0: -INFINITY
-native_color: galera:2 allocation score on controller-1: -INFINITY
-native_color: galera:2 allocation score on controller-2: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on controller-0: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on controller-1: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on controller-2: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on controller-0: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
 native_color: haproxy-bundle-docker-1 allocation score on controller-2: INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on controller-0: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on controller-1: INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on controller-2: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
 native_color: ip-10.0.0.109 allocation score on controller-0: -INFINITY
 native_color: ip-10.0.0.109 allocation score on controller-1: 0
 native_color: ip-10.0.0.109 allocation score on controller-2: 0
-native_color: ip-10.0.0.109 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-10.0.0.109 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-10.0.0.109 allocation score on galera-bundle-2: -INFINITY
-native_color: ip-10.0.0.109 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-10.0.0.109 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-10.0.0.109 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-10.0.0.109 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-10.0.0.109 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-10.0.0.109 allocation score on redis-bundle-2: -INFINITY
 native_color: ip-172.17.1.14 allocation score on controller-0: -INFINITY
 native_color: ip-172.17.1.14 allocation score on controller-1: 0
 native_color: ip-172.17.1.14 allocation score on controller-2: INFINITY
-native_color: ip-172.17.1.14 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.17.1.14 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.17.1.14 allocation score on galera-bundle-2: -INFINITY
-native_color: ip-172.17.1.14 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.17.1.14 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.17.1.14 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.17.1.14 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.17.1.14 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.17.1.14 allocation score on redis-bundle-2: -INFINITY
 native_color: ip-172.17.1.19 allocation score on controller-0: -INFINITY
 native_color: ip-172.17.1.19 allocation score on controller-1: 0
 native_color: ip-172.17.1.19 allocation score on controller-2: INFINITY
-native_color: ip-172.17.1.19 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.17.1.19 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.17.1.19 allocation score on galera-bundle-2: -INFINITY
-native_color: ip-172.17.1.19 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.17.1.19 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.17.1.19 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.17.1.19 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.17.1.19 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.17.1.19 allocation score on redis-bundle-2: -INFINITY
 native_color: ip-172.17.3.19 allocation score on controller-0: -INFINITY
 native_color: ip-172.17.3.19 allocation score on controller-1: 0
 native_color: ip-172.17.3.19 allocation score on controller-2: INFINITY
-native_color: ip-172.17.3.19 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.17.3.19 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.17.3.19 allocation score on galera-bundle-2: -INFINITY
-native_color: ip-172.17.3.19 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.17.3.19 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.17.3.19 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.17.3.19 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.17.3.19 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.17.3.19 allocation score on redis-bundle-2: -INFINITY
 native_color: ip-172.17.4.11 allocation score on controller-0: -INFINITY
 native_color: ip-172.17.4.11 allocation score on controller-1: 0
 native_color: ip-172.17.4.11 allocation score on controller-2: 0
-native_color: ip-172.17.4.11 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.17.4.11 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.17.4.11 allocation score on galera-bundle-2: -INFINITY
-native_color: ip-172.17.4.11 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.17.4.11 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.17.4.11 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.17.4.11 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.17.4.11 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.17.4.11 allocation score on redis-bundle-2: -INFINITY
 native_color: ip-192.168.24.7 allocation score on controller-0: -INFINITY
 native_color: ip-192.168.24.7 allocation score on controller-1: 0
 native_color: ip-192.168.24.7 allocation score on controller-2: 0
-native_color: ip-192.168.24.7 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.24.7 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-192.168.24.7 allocation score on galera-bundle-2: -INFINITY
-native_color: ip-192.168.24.7 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.24.7 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-192.168.24.7 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-192.168.24.7 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-192.168.24.7 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-192.168.24.7 allocation score on redis-bundle-2: -INFINITY
 native_color: openstack-cinder-volume allocation score on controller-0: 0
 native_color: openstack-cinder-volume allocation score on controller-1: 0
 native_color: openstack-cinder-volume allocation score on controller-2: INFINITY
-native_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume allocation score on galera-bundle-1: -INFINITY
-native_color: openstack-cinder-volume allocation score on galera-bundle-2: -INFINITY
-native_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: openstack-cinder-volume allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
-native_color: openstack-cinder-volume allocation score on redis-bundle-1: -INFINITY
-native_color: openstack-cinder-volume allocation score on redis-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on controller-0: INFINITY
 native_color: rabbitmq-bundle-0 allocation score on controller-1: 0
 native_color: rabbitmq-bundle-0 allocation score on controller-2: 0
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on controller-0: 0
 native_color: rabbitmq-bundle-1 allocation score on controller-1: INFINITY
 native_color: rabbitmq-bundle-1 allocation score on controller-2: 0
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on controller-0: 0
 native_color: rabbitmq-bundle-2 allocation score on controller-1: 0
 native_color: rabbitmq-bundle-2 allocation score on controller-2: INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on controller-1: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on controller-2: -INFINITY
@@ -972,177 +285,45 @@ native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-2: -I
 native_color: rabbitmq-bundle-docker-1 allocation score on controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on controller-1: INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on controller-2: 0
-native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on controller-1: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on controller-2: INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:0 allocation score on controller-0: -INFINITY
-native_color: rabbitmq:0 allocation score on controller-1: -INFINITY
-native_color: rabbitmq:0 allocation score on controller-2: -INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:1 allocation score on controller-0: -INFINITY
-native_color: rabbitmq:1 allocation score on controller-1: -INFINITY
-native_color: rabbitmq:1 allocation score on controller-2: -INFINITY
-native_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-native_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:2 allocation score on controller-0: -INFINITY
-native_color: rabbitmq:2 allocation score on controller-1: -INFINITY
-native_color: rabbitmq:2 allocation score on controller-2: -INFINITY
-native_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
 native_color: redis-bundle-0 allocation score on controller-0: INFINITY
 native_color: redis-bundle-0 allocation score on controller-1: 0
 native_color: redis-bundle-0 allocation score on controller-2: 0
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
 native_color: redis-bundle-1 allocation score on controller-0: 0
 native_color: redis-bundle-1 allocation score on controller-1: INFINITY
 native_color: redis-bundle-1 allocation score on controller-2: 0
-native_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
-native_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
 native_color: redis-bundle-2 allocation score on controller-0: 0
 native_color: redis-bundle-2 allocation score on controller-1: 0
 native_color: redis-bundle-2 allocation score on controller-2: INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
-native_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on controller-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on controller-1: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on controller-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on controller-0: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on controller-1: INFINITY
 native_color: redis-bundle-docker-1 allocation score on controller-2: 0
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on controller-0: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on controller-1: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on controller-2: INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:0 allocation score on controller-0: -INFINITY
-native_color: redis:0 allocation score on controller-1: -INFINITY
-native_color: redis:0 allocation score on controller-2: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:1 allocation score on controller-0: -INFINITY
-native_color: redis:1 allocation score on controller-1: -INFINITY
-native_color: redis:1 allocation score on controller-2: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 native_color: redis:1 allocation score on redis-bundle-1: INFINITY
-native_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:2 allocation score on controller-0: -INFINITY
-native_color: redis:2 allocation score on controller-1: -INFINITY
-native_color: redis:2 allocation score on controller-2: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 native_color: redis:2 allocation score on redis-bundle-2: INFINITY
 native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on controller-0: INFINITY
 native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on controller-1: -INFINITY
 native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on controller-2: 0
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on galera-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on galera-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on galera-bundle-2: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on redis-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on redis-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-5254000dcb3f allocation score on redis-bundle-2: -INFINITY
 native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on controller-0: INFINITY
 native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on controller-1: 0
 native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on controller-2: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on galera-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on galera-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on galera-bundle-2: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on redis-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on redis-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-5254003e8e97 allocation score on redis-bundle-2: -INFINITY
 native_color: stonith-fence_ipmilan-525400efba5c allocation score on controller-0: -INFINITY
 native_color: stonith-fence_ipmilan-525400efba5c allocation score on controller-1: 0
 native_color: stonith-fence_ipmilan-525400efba5c allocation score on controller-2: INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on galera-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on galera-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on galera-bundle-2: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on redis-bundle-0: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on redis-bundle-1: -INFINITY
-native_color: stonith-fence_ipmilan-525400efba5c allocation score on redis-bundle-2: -INFINITY
 redis:0 promotion score on redis-bundle-0: -1
 redis:1 promotion score on redis-bundle-1: 1
 redis:2 promotion score on redis-bundle-2: 1
diff --git a/pengine/test10/bundle-order-partial-start-2.exp b/pengine/test10/bundle-order-partial-start-2.exp
index 1be25f6..c253553 100644
--- a/pengine/test10/bundle-order-partial-start-2.exp
+++ b/pengine/test10/bundle-order-partial-start-2.exp
@@ -317,7 +317,7 @@
     <action_set>
       <rsc_op id="136" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -330,7 +330,7 @@
     <action_set>
       <rsc_op id="135" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -359,7 +359,7 @@
     <action_set>
       <rsc_op id="73" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-partial-start-2.scores b/pengine/test10/bundle-order-partial-start-2.scores
index b4a441d..954661e 100644
--- a/pengine/test10/bundle-order-partial-start-2.scores
+++ b/pengine/test10/bundle-order-partial-start-2.scores
@@ -1,61 +1,19 @@
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera-bundle-master allocation score on undercloud: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on undercloud: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on undercloud: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on undercloud: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on undercloud: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle allocation score on undercloud: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-0 allocation score on undercloud: INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on undercloud: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on undercloud: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
@@ -64,134 +22,46 @@ container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: openstack-cinder-volume allocation score on undercloud: 0
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle allocation score on undercloud: 0
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on undercloud: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: 500
-container_color: rabbitmq:0 allocation score on undercloud: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle allocation score on undercloud: 0
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on undercloud: 0
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on undercloud: 0
 galera:0 promotion score on galera-bundle-0: -1
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-0 allocation score on undercloud: INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on undercloud: INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on undercloud: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.247 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on redis-bundle-0: -INFINITY
+native_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 native_color: ip-192.168.122.247 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.248 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.248 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.249 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.249 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.250 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.250 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.253 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.253 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.254 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.254 allocation score on undercloud: INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on undercloud: INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on undercloud: INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-0 allocation score on undercloud: INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on undercloud: INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on undercloud: -INFINITY
 redis:0 promotion score on redis-bundle-0: 3000
diff --git a/pengine/test10/bundle-order-partial-start.exp b/pengine/test10/bundle-order-partial-start.exp
index 037c3e0..21012ce 100644
--- a/pengine/test10/bundle-order-partial-start.exp
+++ b/pengine/test10/bundle-order-partial-start.exp
@@ -298,7 +298,7 @@
     <action_set>
       <rsc_op id="135" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -311,7 +311,7 @@
     <action_set>
       <rsc_op id="134" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -340,7 +340,7 @@
     <action_set>
       <rsc_op id="72" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0" CRM_meta_notify_slave_uname="redis-bundle-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-partial-start.scores b/pengine/test10/bundle-order-partial-start.scores
index 1c50e66..a9b2f06 100644
--- a/pengine/test10/bundle-order-partial-start.scores
+++ b/pengine/test10/bundle-order-partial-start.scores
@@ -1,61 +1,19 @@
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera-bundle-master allocation score on undercloud: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on undercloud: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on undercloud: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on undercloud: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on undercloud: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle allocation score on undercloud: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-0 allocation score on undercloud: 0
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on undercloud: 0
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on undercloud: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on undercloud: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
@@ -64,134 +22,46 @@ container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
+container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: openstack-cinder-volume allocation score on undercloud: 0
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle allocation score on undercloud: 0
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on undercloud: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: 500
-container_color: rabbitmq:0 allocation score on undercloud: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle allocation score on undercloud: 0
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on undercloud: 0
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on undercloud: 0
 galera:0 promotion score on galera-bundle-0: -1
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-0 allocation score on undercloud: 10000
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on undercloud: 0
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on undercloud: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.247 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on redis-bundle-0: -INFINITY
+native_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 native_color: ip-192.168.122.247 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.248 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.248 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.249 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.249 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.250 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.250 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.253 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.253 allocation score on undercloud: INFINITY
-native_color: ip-192.168.122.254 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.254 allocation score on undercloud: INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on undercloud: INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on undercloud: INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-0 allocation score on undercloud: INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on undercloud: INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on undercloud: -INFINITY
 redis:0 promotion score on redis-bundle-0: 3000
diff --git a/pengine/test10/bundle-order-partial-stop.exp b/pengine/test10/bundle-order-partial-stop.exp
index c0724c7..0bd404a 100644
--- a/pengine/test10/bundle-order-partial-stop.exp
+++ b/pengine/test10/bundle-order-partial-stop.exp
@@ -280,7 +280,7 @@
     <action_set>
       <rsc_op id="138" operation="notify" operation_key="redis_post_notify_demote_0" internal_operation_key="redis:0_post_notify_demote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -293,7 +293,7 @@
     <action_set>
       <rsc_op id="137" operation="notify" operation_key="redis_pre_notify_demote_0" internal_operation_key="redis:0_pre_notify_demote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -306,7 +306,7 @@
     <action_set>
       <rsc_op id="136" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:0_pre_notify_stop_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -319,7 +319,7 @@
     <action_set>
       <rsc_op id="70" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -338,7 +338,7 @@
     <action_set>
       <rsc_op id="69" operation="demote" operation_key="redis_demote_0" internal_operation_key="redis:0_demote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-partial-stop.scores b/pengine/test10/bundle-order-partial-stop.scores
index 528842e..abe9bbc 100644
--- a/pengine/test10/bundle-order-partial-stop.scores
+++ b/pengine/test10/bundle-order-partial-stop.scores
@@ -1,61 +1,19 @@
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera-bundle-master allocation score on undercloud: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on undercloud: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on undercloud: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on undercloud: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on undercloud: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle allocation score on undercloud: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-0 allocation score on undercloud: INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on undercloud: 0
 container_color: galera:0 allocation score on galera-bundle-0: INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on undercloud: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
@@ -64,30 +22,6 @@ container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
@@ -96,104 +30,40 @@ container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINI
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume allocation score on undercloud: 0
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle allocation score on undercloud: 0
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on undercloud: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-container_color: rabbitmq:0 allocation score on undercloud: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle allocation score on undercloud: 0
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on undercloud: 0
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on undercloud: 0
 galera:0 promotion score on galera-bundle-0: 100
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-0 allocation score on undercloud: INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on undercloud: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on undercloud: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.247 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.247 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.248 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.248 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.249 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.249 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.250 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.250 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.253 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.253 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.254 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.254 allocation score on undercloud: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on undercloud: -INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on undercloud: -INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-0 allocation score on undercloud: INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on undercloud: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on undercloud: -INFINITY
 redis:0 promotion score on redis-bundle-0: 1
diff --git a/pengine/test10/bundle-order-startup-clone-2.exp b/pengine/test10/bundle-order-startup-clone-2.exp
index b2bbf52..53ca437 100644
--- a/pengine/test10/bundle-order-startup-clone-2.exp
+++ b/pengine/test10/bundle-order-startup-clone-2.exp
@@ -1181,7 +1181,7 @@
     <action_set>
       <rsc_op id="186" operation="notify" operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1194,7 +1194,7 @@
     <action_set>
       <rsc_op id="185" operation="notify" operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1207,7 +1207,7 @@
     <action_set>
       <rsc_op id="182" operation="notify" operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1245,7 +1245,7 @@
     <action_set>
       <rsc_op id="132" operation="promote" operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1267,7 +1267,7 @@
     <action_set>
       <rsc_op id="131" operation="start" operation_key="redis:0_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-1">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1286,7 +1286,7 @@
     <action_set>
       <rsc_op id="188" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="metal-2">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1299,7 +1299,7 @@
     <action_set>
       <rsc_op id="187" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="metal-2">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1312,7 +1312,7 @@
     <action_set>
       <rsc_op id="183" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="metal-2">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1350,7 +1350,7 @@
     <action_set>
       <rsc_op id="135" operation="promote" operation_key="redis:1_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="metal-2">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1375,7 +1375,7 @@
     <action_set>
       <rsc_op id="134" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="metal-2">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="metal-2" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1397,7 +1397,7 @@
     <action_set>
       <rsc_op id="190" operation="notify" operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="metal-3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1410,7 +1410,7 @@
     <action_set>
       <rsc_op id="189" operation="notify" operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="metal-3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1423,7 +1423,7 @@
     <action_set>
       <rsc_op id="184" operation="notify" operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="metal-3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1461,7 +1461,7 @@
     <action_set>
       <rsc_op id="138" operation="promote" operation_key="redis:2_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="metal-3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1486,7 +1486,7 @@
     <action_set>
       <rsc_op id="137" operation="start" operation_key="redis:2_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="metal-3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="rabbitmq-bundle-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 metal-3 metal-2 metal-1 galera-bundle-2 galera-bundle-1 galera-bundle-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 galera-bundle-1 galera-bundle-2 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="redis-bundle-1 redis-bundle-0 rabbitmq-bundle-0 redis-bundle-2 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0 redis:1 redis:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0 redis:1 redis:2" CRM_meta_notify_promote_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0 redis:1 redis:2" CRM_meta_notify_start_uname="redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="metal-3" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-startup-clone-2.scores b/pengine/test10/bundle-order-startup-clone-2.scores
index bcc4905..30e15d8 100644
--- a/pengine/test10/bundle-order-startup-clone-2.scores
+++ b/pengine/test10/bundle-order-startup-clone-2.scores
@@ -7,29 +7,8 @@ clone_color: galera-bundle-master allocation score on metal-2: -INFINITY
 clone_color: galera-bundle-master allocation score on metal-3: -INFINITY
 clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:0 allocation score on metal-1: -INFINITY
-clone_color: galera:0 allocation score on metal-2: -INFINITY
-clone_color: galera:0 allocation score on metal-3: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on metal-1: -INFINITY
-clone_color: galera:1 allocation score on metal-2: -INFINITY
-clone_color: galera:1 allocation score on metal-3: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
-clone_color: galera:2 allocation score on metal-1: -INFINITY
-clone_color: galera:2 allocation score on metal-2: -INFINITY
-clone_color: galera:2 allocation score on metal-3: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-1: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-2: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-3: -INFINITY
@@ -37,35 +16,8 @@ clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINIT
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-1: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-2: 0
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:0 allocation score on metal-1: -INFINITY
-clone_color: redis:0 allocation score on metal-2: -INFINITY
-clone_color: redis:0 allocation score on metal-3: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on metal-1: -INFINITY
-clone_color: redis:1 allocation score on metal-2: -INFINITY
-clone_color: redis:1 allocation score on metal-3: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 clone_color: redis:1 allocation score on redis-bundle-1: INFINITY
-clone_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on metal-1: -INFINITY
-clone_color: redis:2 allocation score on metal-2: -INFINITY
-clone_color: redis:2 allocation score on metal-3: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 clone_color: redis:2 allocation score on redis-bundle-2: INFINITY
 clone_color: storage-clone allocation score on metal-1: 0
 clone_color: storage-clone allocation score on metal-2: 0
@@ -87,51 +39,30 @@ clone_color: storage:3 allocation score on metal-1: 0
 clone_color: storage:3 allocation score on metal-2: 0
 clone_color: storage:3 allocation score on metal-3: 0
 clone_color: storage:3 allocation score on rabbitmq-bundle-0: 0
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle allocation score on metal-1: 0
 container_color: galera-bundle allocation score on metal-2: 0
 container_color: galera-bundle allocation score on metal-3: 0
 container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on metal-1: 0
 container_color: galera-bundle-0 allocation score on metal-2: 0
 container_color: galera-bundle-0 allocation score on metal-3: 0
 container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on metal-1: 0
 container_color: galera-bundle-1 allocation score on metal-2: 0
 container_color: galera-bundle-1 allocation score on metal-3: 0
 container_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on metal-1: 0
 container_color: galera-bundle-2 allocation score on metal-2: 0
 container_color: galera-bundle-2 allocation score on metal-3: 0
 container_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on metal-1: 0
 container_color: galera-bundle-docker-0 allocation score on metal-2: 0
 container_color: galera-bundle-docker-0 allocation score on metal-3: 0
 container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on metal-1: 0
 container_color: galera-bundle-docker-1 allocation score on metal-2: 0
 container_color: galera-bundle-docker-1 allocation score on metal-3: 0
 container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on metal-1: 0
 container_color: galera-bundle-docker-2 allocation score on metal-2: 0
 container_color: galera-bundle-docker-2 allocation score on metal-3: 0
@@ -144,38 +75,8 @@ container_color: galera-bundle-master allocation score on metal-2: 0
 container_color: galera-bundle-master allocation score on metal-3: 0
 container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on metal-1: 0
-container_color: galera:0 allocation score on metal-2: 0
-container_color: galera:0 allocation score on metal-3: 0
-container_color: galera:0 allocation score on rabbitmq-bundle-0: 0
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: 500
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on metal-1: 0
-container_color: galera:1 allocation score on metal-2: 0
-container_color: galera:1 allocation score on metal-3: 0
-container_color: galera:1 allocation score on rabbitmq-bundle-0: 0
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: 500
-container_color: galera:2 allocation score on metal-1: 0
-container_color: galera:2 allocation score on metal-2: 0
-container_color: galera:2 allocation score on metal-3: 0
-container_color: galera:2 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle allocation score on metal-1: 0
 container_color: haproxy-bundle allocation score on metal-1: 0
 container_color: haproxy-bundle allocation score on metal-1: 0
@@ -192,18 +93,6 @@ container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
@@ -220,18 +109,6 @@ container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0:
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
@@ -248,18 +125,6 @@ container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0:
 container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
@@ -276,79 +141,34 @@ container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0:
 container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle allocation score on metal-1: 0
 container_color: redis-bundle allocation score on metal-2: 0
 container_color: redis-bundle allocation score on metal-3: 0
 container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-0 allocation score on metal-1: 0
 container_color: redis-bundle-0 allocation score on metal-2: 0
 container_color: redis-bundle-0 allocation score on metal-3: 0
 container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-1 allocation score on metal-1: 0
 container_color: redis-bundle-1 allocation score on metal-2: 0
 container_color: redis-bundle-1 allocation score on metal-3: 0
 container_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-2 allocation score on metal-1: 0
 container_color: redis-bundle-2 allocation score on metal-2: 0
 container_color: redis-bundle-2 allocation score on metal-3: 0
 container_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on metal-1: 0
 container_color: redis-bundle-docker-0 allocation score on metal-2: 0
 container_color: redis-bundle-docker-0 allocation score on metal-3: 0
 container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-1 allocation score on metal-1: 0
 container_color: redis-bundle-docker-1 allocation score on metal-2: 0
 container_color: redis-bundle-docker-1 allocation score on metal-3: 0
 container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-2 allocation score on metal-1: 0
 container_color: redis-bundle-docker-2 allocation score on metal-2: 0
 container_color: redis-bundle-docker-2 allocation score on metal-3: 0
 container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-master allocation score on metal-1: 0
 container_color: redis-bundle-master allocation score on metal-2: 0
 container_color: redis-bundle-master allocation score on metal-3: 0
@@ -356,212 +176,77 @@ container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: 0
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-1: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-2: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:0 allocation score on metal-1: 0
-container_color: redis:0 allocation score on metal-2: 0
-container_color: redis:0 allocation score on metal-3: 0
-container_color: redis:0 allocation score on rabbitmq-bundle-0: 0
 container_color: redis:0 allocation score on redis-bundle-0: 500
-container_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:1 allocation score on metal-1: 0
-container_color: redis:1 allocation score on metal-2: 0
-container_color: redis:1 allocation score on metal-3: 0
-container_color: redis:1 allocation score on rabbitmq-bundle-0: 0
-container_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 container_color: redis:1 allocation score on redis-bundle-1: 500
-container_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:2 allocation score on metal-1: 0
-container_color: redis:2 allocation score on metal-2: 0
-container_color: redis:2 allocation score on metal-3: 0
-container_color: redis:2 allocation score on rabbitmq-bundle-0: 0
-container_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 container_color: redis:2 allocation score on redis-bundle-2: 500
 galera:0 promotion score on galera-bundle-0: -1
 galera:1 promotion score on galera-bundle-1: -1
 galera:2 promotion score on galera-bundle-2: -1
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-0 allocation score on metal-1: 10000
 native_color: galera-bundle-0 allocation score on metal-2: 0
 native_color: galera-bundle-0 allocation score on metal-3: 0
 native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on metal-1: 0
 native_color: galera-bundle-1 allocation score on metal-2: 10000
 native_color: galera-bundle-1 allocation score on metal-3: 0
 native_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on metal-1: 0
 native_color: galera-bundle-2 allocation score on metal-2: 0
 native_color: galera-bundle-2 allocation score on metal-3: 10000
 native_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on metal-1: 0
 native_color: galera-bundle-docker-0 allocation score on metal-2: 0
 native_color: galera-bundle-docker-0 allocation score on metal-3: 0
 native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on metal-1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on metal-2: 0
 native_color: galera-bundle-docker-1 allocation score on metal-3: 0
 native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on metal-1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on metal-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on metal-3: 0
 native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on metal-1: -INFINITY
-native_color: galera:0 allocation score on metal-2: -INFINITY
-native_color: galera:0 allocation score on metal-3: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on metal-1: -INFINITY
-native_color: galera:1 allocation score on metal-2: -INFINITY
-native_color: galera:1 allocation score on metal-3: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
-native_color: galera:2 allocation score on metal-1: -INFINITY
-native_color: galera:2 allocation score on metal-2: -INFINITY
-native_color: galera:2 allocation score on metal-3: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
 native_color: haproxy-bundle-docker-0 allocation score on metal-2: 0
 native_color: haproxy-bundle-docker-0 allocation score on metal-3: 0
 native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on metal-2: 0
 native_color: haproxy-bundle-docker-1 allocation score on metal-3: 0
 native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on metal-2: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on metal-3: 0
 native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-0 allocation score on metal-1: 10000
 native_color: redis-bundle-0 allocation score on metal-2: 0
 native_color: redis-bundle-0 allocation score on metal-3: 0
 native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-1 allocation score on metal-1: 0
 native_color: redis-bundle-1 allocation score on metal-2: 10000
 native_color: redis-bundle-1 allocation score on metal-3: 0
 native_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-2 allocation score on metal-1: 0
 native_color: redis-bundle-2 allocation score on metal-2: 0
 native_color: redis-bundle-2 allocation score on metal-3: 10000
 native_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-1: 0
 native_color: redis-bundle-docker-0 allocation score on metal-2: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-3: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on metal-1: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on metal-2: 0
 native_color: redis-bundle-docker-1 allocation score on metal-3: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on metal-1: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on metal-2: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on metal-3: 0
 native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:0 allocation score on metal-1: -INFINITY
-native_color: redis:0 allocation score on metal-2: -INFINITY
-native_color: redis:0 allocation score on metal-3: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:1 allocation score on metal-1: -INFINITY
-native_color: redis:1 allocation score on metal-2: -INFINITY
-native_color: redis:1 allocation score on metal-3: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 native_color: redis:1 allocation score on redis-bundle-1: INFINITY
-native_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:2 allocation score on metal-1: -INFINITY
-native_color: redis:2 allocation score on metal-2: -INFINITY
-native_color: redis:2 allocation score on metal-3: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 native_color: redis:2 allocation score on redis-bundle-2: INFINITY
 native_color: storage:0 allocation score on metal-1: 0
 native_color: storage:0 allocation score on metal-2: 0
diff --git a/pengine/test10/bundle-order-startup-clone.exp b/pengine/test10/bundle-order-startup-clone.exp
index 46d969c..123f0e2 100644
--- a/pengine/test10/bundle-order-startup-clone.exp
+++ b/pengine/test10/bundle-order-startup-clone.exp
@@ -119,7 +119,7 @@
     <action_set>
       <rsc_op id="112" operation="notify" operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-2">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0" CRM_meta_notify_available_uname="redis-bundle-0 rabbitmq-bundle-0 galera-bundle-0 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0" CRM_meta_notify_available_uname="redis-bundle-0 rabbitmq-bundle-0 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-2" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -170,7 +170,7 @@
     <action_set>
       <rsc_op id="75" operation="start" operation_key="redis:0_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="metal-2">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0" CRM_meta_notify_available_uname="redis-bundle-0 rabbitmq-bundle-0 galera-bundle-0 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-2" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 metal-1 metal-2 metal-3 rabbitmq-bundle-0 redis-bundle-0" CRM_meta_notify_available_uname="redis-bundle-0 rabbitmq-bundle-0 metal-3 metal-2 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="metal-2" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-startup-clone.scores b/pengine/test10/bundle-order-startup-clone.scores
index 4361fc4..8786633 100644
--- a/pengine/test10/bundle-order-startup-clone.scores
+++ b/pengine/test10/bundle-order-startup-clone.scores
@@ -5,21 +5,11 @@ clone_color: galera-bundle-master allocation score on metal-2: -INFINITY
 clone_color: galera-bundle-master allocation score on metal-3: -INFINITY
 clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on metal-1: -INFINITY
-clone_color: galera:0 allocation score on metal-2: -INFINITY
-clone_color: galera:0 allocation score on metal-3: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-1: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-2: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-3: -INFINITY
 clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on metal-1: -INFINITY
-clone_color: redis:0 allocation score on metal-2: -INFINITY
-clone_color: redis:0 allocation score on metal-3: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
 clone_color: storage-clone allocation score on metal-1: 0
 clone_color: storage-clone allocation score on metal-2: 0
@@ -41,17 +31,14 @@ clone_color: storage:3 allocation score on metal-1: 0
 clone_color: storage:3 allocation score on metal-2: 0
 clone_color: storage:3 allocation score on metal-3: 0
 clone_color: storage:3 allocation score on rabbitmq-bundle-0: 0
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle allocation score on metal-1: 0
 container_color: galera-bundle allocation score on metal-2: 0
 container_color: galera-bundle allocation score on metal-3: 0
 container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-0 allocation score on metal-1: 0
 container_color: galera-bundle-0 allocation score on metal-2: 0
 container_color: galera-bundle-0 allocation score on metal-3: 0
 container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on metal-1: 0
 container_color: galera-bundle-docker-0 allocation score on metal-2: 0
 container_color: galera-bundle-docker-0 allocation score on metal-3: 0
@@ -62,12 +49,6 @@ container_color: galera-bundle-master allocation score on metal-2: 0
 container_color: galera-bundle-master allocation score on metal-3: 0
 container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on metal-1: 0
-container_color: galera:0 allocation score on metal-2: 0
-container_color: galera:0 allocation score on metal-3: 0
-container_color: galera:0 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
 container_color: haproxy-bundle allocation score on metal-1: 0
 container_color: haproxy-bundle allocation score on metal-1: 0
 container_color: haproxy-bundle allocation score on metal-2: 0
@@ -76,8 +57,6 @@ container_color: haproxy-bundle allocation score on metal-3: 0
 container_color: haproxy-bundle allocation score on metal-3: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
 container_color: haproxy-bundle-docker-0 allocation score on metal-2: 0
@@ -86,74 +65,46 @@ container_color: haproxy-bundle-docker-0 allocation score on metal-3: 0
 container_color: haproxy-bundle-docker-0 allocation score on metal-3: 0
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
 container_color: redis-bundle allocation score on metal-1: 0
 container_color: redis-bundle allocation score on metal-2: 0
 container_color: redis-bundle allocation score on metal-3: 0
 container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
 container_color: redis-bundle-0 allocation score on metal-1: 0
 container_color: redis-bundle-0 allocation score on metal-2: 0
 container_color: redis-bundle-0 allocation score on metal-3: 0
 container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on metal-1: 0
 container_color: redis-bundle-docker-0 allocation score on metal-2: 0
 container_color: redis-bundle-docker-0 allocation score on metal-3: 0
 container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on metal-1: 0
 container_color: redis-bundle-master allocation score on metal-2: 0
 container_color: redis-bundle-master allocation score on metal-3: 0
 container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: 0
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on metal-1: 0
-container_color: redis:0 allocation score on metal-2: 0
-container_color: redis:0 allocation score on metal-3: 0
-container_color: redis:0 allocation score on rabbitmq-bundle-0: 0
 container_color: redis:0 allocation score on redis-bundle-0: 500
 galera:0 promotion score on galera-bundle-0: -1
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
 native_color: galera-bundle-0 allocation score on metal-1: 10000
 native_color: galera-bundle-0 allocation score on metal-2: 0
 native_color: galera-bundle-0 allocation score on metal-3: 0
 native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on metal-1: 0
 native_color: galera-bundle-docker-0 allocation score on metal-2: 0
 native_color: galera-bundle-docker-0 allocation score on metal-3: 0
 native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on metal-1: -INFINITY
-native_color: galera:0 allocation score on metal-2: -INFINITY
-native_color: galera:0 allocation score on metal-3: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on metal-1: 0
 native_color: haproxy-bundle-docker-0 allocation score on metal-2: 0
 native_color: haproxy-bundle-docker-0 allocation score on metal-3: 0
 native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
 native_color: redis-bundle-0 allocation score on metal-1: 0
 native_color: redis-bundle-0 allocation score on metal-2: 10000
 native_color: redis-bundle-0 allocation score on metal-3: 0
 native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-1: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-2: 0
 native_color: redis-bundle-docker-0 allocation score on metal-3: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on metal-1: -INFINITY
-native_color: redis:0 allocation score on metal-2: -INFINITY
-native_color: redis:0 allocation score on metal-3: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
 native_color: storage:0 allocation score on metal-1: 0
 native_color: storage:0 allocation score on metal-2: 0
diff --git a/pengine/test10/bundle-order-startup.exp b/pengine/test10/bundle-order-startup.exp
index 3f50562..9ed9c3d 100644
--- a/pengine/test10/bundle-order-startup.exp
+++ b/pengine/test10/bundle-order-startup.exp
@@ -378,7 +378,7 @@
     <action_set>
       <rsc_op id="130" operation="notify" operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -429,7 +429,7 @@
     <action_set>
       <rsc_op id="69" operation="start" operation_key="redis:0_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-startup.scores b/pengine/test10/bundle-order-startup.scores
index d49dd6e..1ca7652 100644
--- a/pengine/test10/bundle-order-startup.scores
+++ b/pengine/test10/bundle-order-startup.scores
@@ -1,61 +1,19 @@
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera-bundle-master allocation score on undercloud: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on undercloud: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on undercloud: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on undercloud: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on undercloud: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle allocation score on undercloud: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-0 allocation score on undercloud: 0
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on undercloud: 0
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on undercloud: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on undercloud: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
@@ -64,30 +22,6 @@ container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
@@ -96,102 +30,38 @@ container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
-container_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume allocation score on undercloud: 0
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on undercloud: 0
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle allocation score on undercloud: 0
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on undercloud: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on undercloud: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on undercloud: 0
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: 500
-container_color: rabbitmq:0 allocation score on undercloud: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle allocation score on undercloud: 0
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-0 allocation score on undercloud: 0
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on undercloud: 0
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on undercloud: 0
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: 500
-container_color: redis:0 allocation score on undercloud: 0
 galera:0 promotion score on galera-bundle-0: -1
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-0 allocation score on undercloud: 10000
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on undercloud: 0
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on undercloud: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on undercloud: 0
-native_color: ip-192.168.122.247 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.247 allocation score on undercloud: 0
-native_color: ip-192.168.122.248 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.248 allocation score on undercloud: 0
-native_color: ip-192.168.122.249 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.249 allocation score on undercloud: 0
-native_color: ip-192.168.122.250 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.250 allocation score on undercloud: 0
-native_color: ip-192.168.122.253 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.253 allocation score on undercloud: 0
-native_color: ip-192.168.122.254 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.254 allocation score on undercloud: 0
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on undercloud: 0
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on undercloud: 10000
 native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on undercloud: 0
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-0 allocation score on undercloud: 10000
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on undercloud: 0
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on undercloud: -INFINITY
 redis:0 promotion score on redis-bundle-0: -1
diff --git a/pengine/test10/bundle-order-stop-clone.scores b/pengine/test10/bundle-order-stop-clone.scores
index f8ec05c..584af30 100644
--- a/pengine/test10/bundle-order-stop-clone.scores
+++ b/pengine/test10/bundle-order-stop-clone.scores
@@ -7,29 +7,8 @@ clone_color: galera-bundle-master allocation score on metal-2: -INFINITY
 clone_color: galera-bundle-master allocation score on metal-3: -INFINITY
 clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:0 allocation score on metal-1: -INFINITY
-clone_color: galera:0 allocation score on metal-2: -INFINITY
-clone_color: galera:0 allocation score on metal-3: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on metal-1: -INFINITY
-clone_color: galera:1 allocation score on metal-2: -INFINITY
-clone_color: galera:1 allocation score on metal-3: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
-clone_color: galera:2 allocation score on metal-1: -INFINITY
-clone_color: galera:2 allocation score on metal-2: -INFINITY
-clone_color: galera:2 allocation score on metal-3: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-1: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-2: -INFINITY
 clone_color: redis-bundle-master allocation score on metal-3: -INFINITY
@@ -37,35 +16,8 @@ clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINIT
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-1: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-2: 0
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:0 allocation score on metal-1: -INFINITY
-clone_color: redis:0 allocation score on metal-2: -INFINITY
-clone_color: redis:0 allocation score on metal-3: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on metal-1: -INFINITY
-clone_color: redis:1 allocation score on metal-2: -INFINITY
-clone_color: redis:1 allocation score on metal-3: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 clone_color: redis:1 allocation score on redis-bundle-1: INFINITY
-clone_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on metal-1: -INFINITY
-clone_color: redis:2 allocation score on metal-2: -INFINITY
-clone_color: redis:2 allocation score on metal-3: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 clone_color: redis:2 allocation score on redis-bundle-2: INFINITY
 clone_color: storage-clone allocation score on metal-1: -INFINITY
 clone_color: storage-clone allocation score on metal-2: 0
@@ -87,51 +39,30 @@ clone_color: storage:3 allocation score on metal-1: -INFINITY
 clone_color: storage:3 allocation score on metal-2: 0
 clone_color: storage:3 allocation score on metal-3: 0
 clone_color: storage:3 allocation score on rabbitmq-bundle-0: 0
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle allocation score on metal-1: 0
 container_color: galera-bundle allocation score on metal-2: 0
 container_color: galera-bundle allocation score on metal-3: 0
 container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on metal-1: INFINITY
 container_color: galera-bundle-0 allocation score on metal-2: 0
 container_color: galera-bundle-0 allocation score on metal-3: 0
 container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on metal-1: 0
 container_color: galera-bundle-1 allocation score on metal-2: INFINITY
 container_color: galera-bundle-1 allocation score on metal-3: 0
 container_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on metal-1: 0
 container_color: galera-bundle-2 allocation score on metal-2: 0
 container_color: galera-bundle-2 allocation score on metal-3: INFINITY
 container_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on metal-1: INFINITY
 container_color: galera-bundle-docker-0 allocation score on metal-2: 0
 container_color: galera-bundle-docker-0 allocation score on metal-3: 0
 container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on metal-1: 0
 container_color: galera-bundle-docker-1 allocation score on metal-2: INFINITY
 container_color: galera-bundle-docker-1 allocation score on metal-3: 0
 container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on metal-1: 0
 container_color: galera-bundle-docker-2 allocation score on metal-2: 0
 container_color: galera-bundle-docker-2 allocation score on metal-3: INFINITY
@@ -144,38 +75,8 @@ container_color: galera-bundle-master allocation score on metal-2: 0
 container_color: galera-bundle-master allocation score on metal-3: 0
 container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: 0
 container_color: galera:0 allocation score on galera-bundle-0: INFINITY
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on metal-1: 0
-container_color: galera:0 allocation score on metal-2: 0
-container_color: galera:0 allocation score on metal-3: 0
-container_color: galera:0 allocation score on rabbitmq-bundle-0: 0
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: INFINITY
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on metal-1: 0
-container_color: galera:1 allocation score on metal-2: 0
-container_color: galera:1 allocation score on metal-3: 0
-container_color: galera:1 allocation score on rabbitmq-bundle-0: 0
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: INFINITY
-container_color: galera:2 allocation score on metal-1: 0
-container_color: galera:2 allocation score on metal-2: 0
-container_color: galera:2 allocation score on metal-3: 0
-container_color: galera:2 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle allocation score on metal-1: 0
 container_color: haproxy-bundle allocation score on metal-1: 0
 container_color: haproxy-bundle allocation score on metal-1: 0
@@ -192,18 +93,6 @@ container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
 container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on metal-1: INFINITY
@@ -220,18 +109,6 @@ container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0:
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
@@ -248,18 +125,6 @@ container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0:
 container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: 0
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
@@ -276,79 +141,34 @@ container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0:
 container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle allocation score on metal-1: 0
 container_color: redis-bundle allocation score on metal-2: 0
 container_color: redis-bundle allocation score on metal-3: 0
 container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-0 allocation score on metal-1: INFINITY
 container_color: redis-bundle-0 allocation score on metal-2: 0
 container_color: redis-bundle-0 allocation score on metal-3: 0
 container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-1 allocation score on metal-1: 0
 container_color: redis-bundle-1 allocation score on metal-2: INFINITY
 container_color: redis-bundle-1 allocation score on metal-3: 0
 container_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-2 allocation score on metal-1: 0
 container_color: redis-bundle-2 allocation score on metal-2: 0
 container_color: redis-bundle-2 allocation score on metal-3: INFINITY
 container_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on metal-1: INFINITY
 container_color: redis-bundle-docker-0 allocation score on metal-2: 0
 container_color: redis-bundle-docker-0 allocation score on metal-3: 0
 container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-1 allocation score on metal-1: 0
 container_color: redis-bundle-docker-1 allocation score on metal-2: INFINITY
 container_color: redis-bundle-docker-1 allocation score on metal-3: 0
 container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-2 allocation score on metal-1: 0
 container_color: redis-bundle-docker-2 allocation score on metal-2: 0
 container_color: redis-bundle-docker-2 allocation score on metal-3: INFINITY
 container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-master allocation score on metal-1: 0
 container_color: redis-bundle-master allocation score on metal-2: 0
 container_color: redis-bundle-master allocation score on metal-3: 0
@@ -356,66 +176,24 @@ container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: 0
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-1: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-2: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:0 allocation score on metal-1: 0
-container_color: redis:0 allocation score on metal-2: 0
-container_color: redis:0 allocation score on metal-3: 0
-container_color: redis:0 allocation score on rabbitmq-bundle-0: 0
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:1 allocation score on metal-1: 0
-container_color: redis:1 allocation score on metal-2: 0
-container_color: redis:1 allocation score on metal-3: 0
-container_color: redis:1 allocation score on rabbitmq-bundle-0: 0
-container_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 container_color: redis:1 allocation score on redis-bundle-1: INFINITY
-container_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:2 allocation score on metal-1: 0
-container_color: redis:2 allocation score on metal-2: 0
-container_color: redis:2 allocation score on metal-3: 0
-container_color: redis:2 allocation score on rabbitmq-bundle-0: 0
-container_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 container_color: redis:2 allocation score on redis-bundle-2: INFINITY
 galera:0 promotion score on galera-bundle-0: -1
 galera:1 promotion score on galera-bundle-1: -1
 galera:2 promotion score on galera-bundle-2: -1
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-0 allocation score on metal-1: INFINITY
 native_color: galera-bundle-0 allocation score on metal-2: -10000
 native_color: galera-bundle-0 allocation score on metal-3: -10000
 native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on metal-1: 0
 native_color: galera-bundle-1 allocation score on metal-2: INFINITY
 native_color: galera-bundle-1 allocation score on metal-3: 0
 native_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on metal-1: 0
 native_color: galera-bundle-2 allocation score on metal-2: 0
 native_color: galera-bundle-2 allocation score on metal-3: INFINITY
 native_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on metal-1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on metal-1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on metal-2: -INFINITY
@@ -424,151 +202,55 @@ native_color: galera-bundle-docker-0 allocation score on metal-3: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on metal-3: 0
 native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on metal-1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on metal-2: INFINITY
 native_color: galera-bundle-docker-1 allocation score on metal-3: 0
 native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on metal-1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on metal-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on metal-3: INFINITY
 native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on metal-1: -INFINITY
-native_color: galera:0 allocation score on metal-2: -INFINITY
-native_color: galera:0 allocation score on metal-3: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on metal-1: -INFINITY
-native_color: galera:1 allocation score on metal-2: -INFINITY
-native_color: galera:1 allocation score on metal-3: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
-native_color: galera:2 allocation score on metal-1: -INFINITY
-native_color: galera:2 allocation score on metal-2: -INFINITY
-native_color: galera:2 allocation score on metal-3: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on metal-1: INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on metal-2: 0
 native_color: haproxy-bundle-docker-0 allocation score on metal-3: 0
 native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on metal-1: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on metal-2: INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on metal-3: 0
 native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on metal-1: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on metal-2: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on metal-3: INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-0 allocation score on metal-1: INFINITY
 native_color: redis-bundle-0 allocation score on metal-2: 0
 native_color: redis-bundle-0 allocation score on metal-3: 0
 native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-1 allocation score on metal-1: 0
 native_color: redis-bundle-1 allocation score on metal-2: INFINITY
 native_color: redis-bundle-1 allocation score on metal-3: 0
 native_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-2 allocation score on metal-1: 0
 native_color: redis-bundle-2 allocation score on metal-2: 0
 native_color: redis-bundle-2 allocation score on metal-3: INFINITY
 native_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-1: INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-2: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on metal-3: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on metal-1: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on metal-2: INFINITY
 native_color: redis-bundle-docker-1 allocation score on metal-3: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on metal-1: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on metal-2: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on metal-3: INFINITY
 native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:0 allocation score on metal-1: -INFINITY
-native_color: redis:0 allocation score on metal-2: -INFINITY
-native_color: redis:0 allocation score on metal-3: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:1 allocation score on metal-1: -INFINITY
-native_color: redis:1 allocation score on metal-2: -INFINITY
-native_color: redis:1 allocation score on metal-3: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 native_color: redis:1 allocation score on redis-bundle-1: INFINITY
-native_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:2 allocation score on metal-1: -INFINITY
-native_color: redis:2 allocation score on metal-2: -INFINITY
-native_color: redis:2 allocation score on metal-3: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 native_color: redis:2 allocation score on redis-bundle-2: INFINITY
 native_color: storage:0 allocation score on metal-1: -INFINITY
 native_color: storage:0 allocation score on metal-2: -INFINITY
diff --git a/pengine/test10/bundle-order-stop.exp b/pengine/test10/bundle-order-stop.exp
index c0724c7..0bd404a 100644
--- a/pengine/test10/bundle-order-stop.exp
+++ b/pengine/test10/bundle-order-stop.exp
@@ -280,7 +280,7 @@
     <action_set>
       <rsc_op id="138" operation="notify" operation_key="redis_post_notify_demote_0" internal_operation_key="redis:0_post_notify_demote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -293,7 +293,7 @@
     <action_set>
       <rsc_op id="137" operation="notify" operation_key="redis_pre_notify_demote_0" internal_operation_key="redis:0_pre_notify_demote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -306,7 +306,7 @@
     <action_set>
       <rsc_op id="136" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:0_pre_notify_stop_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -319,7 +319,7 @@
     <action_set>
       <rsc_op id="70" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -338,7 +338,7 @@
     <action_set>
       <rsc_op id="69" operation="demote" operation_key="redis_demote_0" internal_operation_key="redis:0_demote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="undercloud">
         <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 galera-bundle-0 rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0" CRM_meta_notify_active_uname="redis-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="redis-bundle-0 undercloud" CRM_meta_notify_demote_resource="redis:0" CRM_meta_notify_demote_uname="redis-bundle-0" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="redis:0" CRM_meta_notify_master_uname="redis-bundle-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="redis:0" CRM_meta_notify_start_uname="redis-bundle-0" CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="redis-bundle-0" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="120000"  wait_last_known_master="true"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bundle-order-stop.scores b/pengine/test10/bundle-order-stop.scores
index 528842e..abe9bbc 100644
--- a/pengine/test10/bundle-order-stop.scores
+++ b/pengine/test10/bundle-order-stop.scores
@@ -1,61 +1,19 @@
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: galera-bundle-master allocation score on undercloud: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on undercloud: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on undercloud: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on undercloud: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on undercloud: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle allocation score on undercloud: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-0 allocation score on undercloud: INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on undercloud: 0
 container_color: galera:0 allocation score on galera-bundle-0: INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on undercloud: 0
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
@@ -64,30 +22,6 @@ container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
 container_color: haproxy-bundle allocation score on undercloud: 0
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
@@ -96,104 +30,40 @@ container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINI
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume allocation score on undercloud: 0
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle allocation score on undercloud: 0
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on undercloud: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on undercloud: INFINITY
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-container_color: rabbitmq:0 allocation score on undercloud: 0
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle allocation score on undercloud: 0
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on undercloud: INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on undercloud: 0
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on undercloud: 0
 galera:0 promotion score on galera-bundle-0: 100
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-0 allocation score on undercloud: INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on undercloud: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on undercloud: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.247 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.247 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.247 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.248 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.248 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.248 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.249 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.249 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.249 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.250 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.250 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.250 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.253 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.253 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.253 allocation score on undercloud: -INFINITY
-native_color: ip-192.168.122.254 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.122.254 allocation score on redis-bundle-0: -INFINITY
 native_color: ip-192.168.122.254 allocation score on undercloud: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on undercloud: -INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on undercloud: INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on undercloud: -INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on undercloud: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-0 allocation score on undercloud: INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on undercloud: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on undercloud: -INFINITY
 redis:0 promotion score on redis-bundle-0: 1
diff --git a/pengine/test10/bundle-probe-order-1.scores b/pengine/test10/bundle-probe-order-1.scores
index 48e1355..f5c85b9 100644
--- a/pengine/test10/bundle-probe-order-1.scores
+++ b/pengine/test10/bundle-probe-order-1.scores
@@ -6,89 +6,38 @@ clone_color: galera-bundle-master allocation score on centos3: -INFINITY
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-1: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-2: 0
-clone_color: galera:0 allocation score on centos1: -INFINITY
-clone_color: galera:0 allocation score on centos2: -INFINITY
-clone_color: galera:0 allocation score on centos3: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on centos1: -INFINITY
-clone_color: galera:1 allocation score on centos2: -INFINITY
-clone_color: galera:1 allocation score on centos3: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:2 allocation score on centos1: -INFINITY
-clone_color: galera:2 allocation score on centos2: -INFINITY
-clone_color: galera:2 allocation score on centos3: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
 container_color: galera-bundle allocation score on centos1: -INFINITY
 container_color: galera-bundle allocation score on centos2: 0
 container_color: galera-bundle allocation score on centos3: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on centos1: 0
 container_color: galera-bundle-0 allocation score on centos2: 0
 container_color: galera-bundle-0 allocation score on centos3: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on centos1: 0
 container_color: galera-bundle-1 allocation score on centos2: 0
 container_color: galera-bundle-1 allocation score on centos3: 0
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on centos1: 0
 container_color: galera-bundle-2 allocation score on centos2: 0
 container_color: galera-bundle-2 allocation score on centos3: 0
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos2: 0
 container_color: galera-bundle-docker-0 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on centos2: 0
 container_color: galera-bundle-docker-1 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on centos2: 0
 container_color: galera-bundle-docker-2 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-master allocation score on centos1: 0
 container_color: galera-bundle-master allocation score on centos2: 0
 container_color: galera-bundle-master allocation score on centos3: 0
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-1: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on centos1: 0
-container_color: galera:0 allocation score on centos2: 0
-container_color: galera:0 allocation score on centos3: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on centos1: 0
-container_color: galera:1 allocation score on centos2: 0
-container_color: galera:1 allocation score on centos3: 0
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: 500
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:2 allocation score on centos1: 0
-container_color: galera:2 allocation score on centos2: 0
-container_color: galera:2 allocation score on centos3: 0
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: 500
 galera:0 promotion score on none: 0
 galera:1 promotion score on none: 0
@@ -96,54 +45,21 @@ galera:2 promotion score on none: 0
 native_color: galera-bundle-0 allocation score on centos1: 0
 native_color: galera-bundle-0 allocation score on centos2: 0
 native_color: galera-bundle-0 allocation score on centos3: 0
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on centos1: 0
 native_color: galera-bundle-1 allocation score on centos2: 0
 native_color: galera-bundle-1 allocation score on centos3: 0
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on centos1: 0
 native_color: galera-bundle-2 allocation score on centos2: 0
 native_color: galera-bundle-2 allocation score on centos3: 0
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos2: 0
 native_color: galera-bundle-docker-0 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos2: 0
 native_color: galera-bundle-docker-1 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos2: 0
 native_color: galera-bundle-docker-2 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on centos1: -INFINITY
-native_color: galera:0 allocation score on centos2: -INFINITY
-native_color: galera:0 allocation score on centos3: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on centos1: -INFINITY
-native_color: galera:1 allocation score on centos2: -INFINITY
-native_color: galera:1 allocation score on centos3: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:2 allocation score on centos1: -INFINITY
-native_color: galera:2 allocation score on centos2: -INFINITY
-native_color: galera:2 allocation score on centos3: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
diff --git a/pengine/test10/bundle-probe-order-2.scores b/pengine/test10/bundle-probe-order-2.scores
index 1d2c261..a1b6b24 100644
--- a/pengine/test10/bundle-probe-order-2.scores
+++ b/pengine/test10/bundle-probe-order-2.scores
@@ -6,89 +6,38 @@ clone_color: galera-bundle-master allocation score on centos3: -INFINITY
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-1: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-2: 0
-clone_color: galera:0 allocation score on centos1: -INFINITY
-clone_color: galera:0 allocation score on centos2: -INFINITY
-clone_color: galera:0 allocation score on centos3: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on centos1: -INFINITY
-clone_color: galera:1 allocation score on centos2: -INFINITY
-clone_color: galera:1 allocation score on centos3: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:2 allocation score on centos1: -INFINITY
-clone_color: galera:2 allocation score on centos2: -INFINITY
-clone_color: galera:2 allocation score on centos3: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
 container_color: galera-bundle allocation score on centos1: -INFINITY
 container_color: galera-bundle allocation score on centos2: 0
 container_color: galera-bundle allocation score on centos3: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on centos1: 0
 container_color: galera-bundle-0 allocation score on centos2: INFINITY
 container_color: galera-bundle-0 allocation score on centos3: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on centos1: 0
 container_color: galera-bundle-1 allocation score on centos2: 0
 container_color: galera-bundle-1 allocation score on centos3: 0
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on centos1: 0
 container_color: galera-bundle-2 allocation score on centos2: 0
 container_color: galera-bundle-2 allocation score on centos3: 0
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos2: INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on centos2: 0
 container_color: galera-bundle-docker-1 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on centos2: 0
 container_color: galera-bundle-docker-2 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-master allocation score on centos1: 0
 container_color: galera-bundle-master allocation score on centos2: 0
 container_color: galera-bundle-master allocation score on centos3: 0
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-1: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on centos1: 0
-container_color: galera:0 allocation score on centos2: 0
-container_color: galera:0 allocation score on centos3: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on centos1: 0
-container_color: galera:1 allocation score on centos2: 0
-container_color: galera:1 allocation score on centos3: 0
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: 500
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:2 allocation score on centos1: 0
-container_color: galera:2 allocation score on centos2: 0
-container_color: galera:2 allocation score on centos3: 0
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: 500
 galera:0 promotion score on none: 0
 galera:1 promotion score on none: 0
@@ -96,54 +45,21 @@ galera:2 promotion score on none: 0
 native_color: galera-bundle-0 allocation score on centos1: 0
 native_color: galera-bundle-0 allocation score on centos2: INFINITY
 native_color: galera-bundle-0 allocation score on centos3: 0
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on centos1: 0
 native_color: galera-bundle-1 allocation score on centos2: 0
 native_color: galera-bundle-1 allocation score on centos3: 0
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on centos1: 0
 native_color: galera-bundle-2 allocation score on centos2: 0
 native_color: galera-bundle-2 allocation score on centos3: 0
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos2: INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on centos1: -INFINITY
-native_color: galera:0 allocation score on centos2: -INFINITY
-native_color: galera:0 allocation score on centos3: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on centos1: -INFINITY
-native_color: galera:1 allocation score on centos2: -INFINITY
-native_color: galera:1 allocation score on centos3: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:2 allocation score on centos1: -INFINITY
-native_color: galera:2 allocation score on centos2: -INFINITY
-native_color: galera:2 allocation score on centos3: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
diff --git a/pengine/test10/bundle-probe-order-3.scores b/pengine/test10/bundle-probe-order-3.scores
index d3338e4..294b3f6 100644
--- a/pengine/test10/bundle-probe-order-3.scores
+++ b/pengine/test10/bundle-probe-order-3.scores
@@ -6,89 +6,38 @@ clone_color: galera-bundle-master allocation score on centos3: -INFINITY
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-1: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-2: 0
-clone_color: galera:0 allocation score on centos1: -INFINITY
-clone_color: galera:0 allocation score on centos2: -INFINITY
-clone_color: galera:0 allocation score on centos3: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on centos1: -INFINITY
-clone_color: galera:1 allocation score on centos2: -INFINITY
-clone_color: galera:1 allocation score on centos3: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:2 allocation score on centos1: -INFINITY
-clone_color: galera:2 allocation score on centos2: -INFINITY
-clone_color: galera:2 allocation score on centos3: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
 container_color: galera-bundle allocation score on centos1: -INFINITY
 container_color: galera-bundle allocation score on centos2: 0
 container_color: galera-bundle allocation score on centos3: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on centos1: 0
 container_color: galera-bundle-0 allocation score on centos2: 0
 container_color: galera-bundle-0 allocation score on centos3: 0
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on centos1: 0
 container_color: galera-bundle-1 allocation score on centos2: 0
 container_color: galera-bundle-1 allocation score on centos3: 0
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on centos1: 0
 container_color: galera-bundle-2 allocation score on centos2: 0
 container_color: galera-bundle-2 allocation score on centos3: 0
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos2: INFINITY
 container_color: galera-bundle-docker-0 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on centos2: 0
 container_color: galera-bundle-docker-1 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on centos1: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on centos2: 0
 container_color: galera-bundle-docker-2 allocation score on centos3: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-master allocation score on centos1: 0
 container_color: galera-bundle-master allocation score on centos2: 0
 container_color: galera-bundle-master allocation score on centos3: 0
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-1: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on centos1: 0
-container_color: galera:0 allocation score on centos2: 0
-container_color: galera:0 allocation score on centos3: 0
 container_color: galera:0 allocation score on galera-bundle-0: 500
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on centos1: 0
-container_color: galera:1 allocation score on centos2: 0
-container_color: galera:1 allocation score on centos3: 0
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: 500
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:2 allocation score on centos1: 0
-container_color: galera:2 allocation score on centos2: 0
-container_color: galera:2 allocation score on centos3: 0
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: 500
 galera:0 promotion score on none: 0
 galera:1 promotion score on none: 0
@@ -96,54 +45,21 @@ galera:2 promotion score on none: 0
 native_color: galera-bundle-0 allocation score on centos1: 0
 native_color: galera-bundle-0 allocation score on centos2: 0
 native_color: galera-bundle-0 allocation score on centos3: 0
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on centos1: 0
 native_color: galera-bundle-1 allocation score on centos2: 0
 native_color: galera-bundle-1 allocation score on centos3: 0
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on centos1: 0
 native_color: galera-bundle-2 allocation score on centos2: 0
 native_color: galera-bundle-2 allocation score on centos3: 0
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos2: INFINITY
 native_color: galera-bundle-docker-0 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on centos3: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on centos1: -INFINITY
-native_color: galera:0 allocation score on centos2: -INFINITY
-native_color: galera:0 allocation score on centos3: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on centos1: -INFINITY
-native_color: galera:1 allocation score on centos2: -INFINITY
-native_color: galera:1 allocation score on centos3: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:2 allocation score on centos1: -INFINITY
-native_color: galera:2 allocation score on centos2: -INFINITY
-native_color: galera:2 allocation score on centos3: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
diff --git a/pengine/test10/remote-fence-unclean-3.scores b/pengine/test10/remote-fence-unclean-3.scores
index dba2026..014dba6 100644
--- a/pengine/test10/remote-fence-unclean-3.scores
+++ b/pengine/test10/remote-fence-unclean-3.scores
@@ -6,39 +6,9 @@ clone_color: galera-bundle-master allocation score on overcloud-controller-0: -I
 clone_color: galera-bundle-master allocation score on overcloud-controller-1: -INFINITY
 clone_color: galera-bundle-master allocation score on overcloud-controller-2: -INFINITY
 clone_color: galera-bundle-master allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-clone_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:0 allocation score on overcloud-controller-0: -INFINITY
-clone_color: galera:0 allocation score on overcloud-controller-1: -INFINITY
-clone_color: galera:0 allocation score on overcloud-controller-2: -INFINITY
-clone_color: galera:0 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera:0 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-clone_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: galera:1 allocation score on overcloud-controller-0: -INFINITY
-clone_color: galera:1 allocation score on overcloud-controller-1: -INFINITY
-clone_color: galera:1 allocation score on overcloud-controller-2: -INFINITY
-clone_color: galera:1 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 clone_color: galera:2 allocation score on galera-bundle-2: INFINITY
-clone_color: galera:2 allocation score on overcloud-controller-0: -INFINITY
-clone_color: galera:2 allocation score on overcloud-controller-1: -INFINITY
-clone_color: galera:2 allocation score on overcloud-controller-2: -INFINITY
-clone_color: galera:2 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: galera:2 allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on overcloud-controller-0: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on overcloud-controller-1: -INFINITY
 clone_color: rabbitmq-bundle-clone allocation score on overcloud-controller-2: -INFINITY
@@ -46,149 +16,47 @@ clone_color: rabbitmq-bundle-clone allocation score on overcloud-novacompute-0:
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: 0
 clone_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: 0
-clone_color: rabbitmq:0 allocation score on overcloud-controller-0: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-controller-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-controller-2: -INFINITY
-clone_color: rabbitmq:0 allocation score on overcloud-novacompute-0: -INFINITY
 clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-controller-0: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-controller-1: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-controller-2: -INFINITY
-clone_color: rabbitmq:1 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-clone_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-controller-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-controller-1: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-controller-2: -INFINITY
-clone_color: rabbitmq:2 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 clone_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-clone_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
 clone_color: redis-bundle-master allocation score on overcloud-controller-0: -INFINITY
 clone_color: redis-bundle-master allocation score on overcloud-controller-1: -INFINITY
 clone_color: redis-bundle-master allocation score on overcloud-controller-2: -INFINITY
 clone_color: redis-bundle-master allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: redis-bundle-master allocation score on redis-bundle-0: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-1: 0
 clone_color: redis-bundle-master allocation score on redis-bundle-2: 0
-clone_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:0 allocation score on overcloud-controller-0: -INFINITY
-clone_color: redis:0 allocation score on overcloud-controller-1: -INFINITY
-clone_color: redis:0 allocation score on overcloud-controller-2: -INFINITY
-clone_color: redis:0 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on rabbitmq-bundle-2: -INFINITY
 clone_color: redis:0 allocation score on redis-bundle-0: INFINITY
-clone_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-clone_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on overcloud-controller-0: -INFINITY
-clone_color: redis:1 allocation score on overcloud-controller-1: -INFINITY
-clone_color: redis:1 allocation score on overcloud-controller-2: -INFINITY
-clone_color: redis:1 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis:1 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 clone_color: redis:1 allocation score on redis-bundle-1: INFINITY
-clone_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-clone_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on overcloud-controller-0: -INFINITY
-clone_color: redis:2 allocation score on overcloud-controller-1: -INFINITY
-clone_color: redis:2 allocation score on overcloud-controller-2: -INFINITY
-clone_color: redis:2 allocation score on overcloud-novacompute-0: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-1: -INFINITY
-clone_color: redis:2 allocation score on rabbitmq-bundle-2: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-clone_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 clone_color: redis:2 allocation score on redis-bundle-2: INFINITY
-container_color: galera-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle allocation score on overcloud-controller-0: 0
 container_color: galera-bundle allocation score on overcloud-controller-1: 0
 container_color: galera-bundle allocation score on overcloud-controller-2: 0
 container_color: galera-bundle allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-0 allocation score on overcloud-controller-0: INFINITY
 container_color: galera-bundle-0 allocation score on overcloud-controller-1: 0
 container_color: galera-bundle-0 allocation score on overcloud-controller-2: 0
 container_color: galera-bundle-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-1 allocation score on overcloud-controller-0: 0
 container_color: galera-bundle-1 allocation score on overcloud-controller-1: INFINITY
 container_color: galera-bundle-1 allocation score on overcloud-controller-2: 0
 container_color: galera-bundle-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-2 allocation score on overcloud-controller-0: 0
 container_color: galera-bundle-2 allocation score on overcloud-controller-1: 0
 container_color: galera-bundle-2 allocation score on overcloud-controller-2: INFINITY
 container_color: galera-bundle-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: galera-bundle-docker-0 allocation score on overcloud-controller-1: 0
 container_color: galera-bundle-docker-0 allocation score on overcloud-controller-2: 0
 container_color: galera-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-controller-0: 0
 container_color: galera-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 container_color: galera-bundle-docker-1 allocation score on overcloud-controller-2: 0
 container_color: galera-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-controller-0: 0
 container_color: galera-bundle-docker-2 allocation score on overcloud-controller-1: 0
 container_color: galera-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 container_color: galera-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-0: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-1: -INFINITY
 container_color: galera-bundle-master allocation score on galera-bundle-2: -INFINITY
@@ -196,60 +64,9 @@ container_color: galera-bundle-master allocation score on overcloud-controller-0
 container_color: galera-bundle-master allocation score on overcloud-controller-1: 0
 container_color: galera-bundle-master allocation score on overcloud-controller-2: 0
 container_color: galera-bundle-master allocation score on overcloud-novacompute-0: 0
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: galera:0 allocation score on galera-bundle-0: INFINITY
-container_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-container_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:0 allocation score on overcloud-controller-0: 0
-container_color: galera:0 allocation score on overcloud-controller-1: 0
-container_color: galera:0 allocation score on overcloud-controller-2: 0
-container_color: galera:0 allocation score on overcloud-novacompute-0: 0
-container_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera:0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 container_color: galera:1 allocation score on galera-bundle-1: INFINITY
-container_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-container_color: galera:1 allocation score on overcloud-controller-0: 0
-container_color: galera:1 allocation score on overcloud-controller-1: 0
-container_color: galera:1 allocation score on overcloud-controller-2: 0
-container_color: galera:1 allocation score on overcloud-novacompute-0: 0
-container_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera:1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-container_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 container_color: galera:2 allocation score on galera-bundle-2: INFINITY
-container_color: galera:2 allocation score on overcloud-controller-0: 0
-container_color: galera:2 allocation score on overcloud-controller-1: 0
-container_color: galera:2 allocation score on overcloud-controller-2: 0
-container_color: galera:2 allocation score on overcloud-novacompute-0: 0
-container_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: galera:2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: galera:2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle allocation score on overcloud-controller-0: 0
 container_color: haproxy-bundle allocation score on overcloud-controller-0: 0
 container_color: haproxy-bundle allocation score on overcloud-controller-0: 0
@@ -278,69 +95,6 @@ container_color: haproxy-bundle allocation score on overcloud-novacompute-0: -IN
 container_color: haproxy-bundle allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle allocation score on overcloud-novacompute-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
@@ -349,19 +103,19 @@ container_color: haproxy-bundle-docker-0 allocation score on overcloud-controlle
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
@@ -369,69 +123,6 @@ container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompu
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
@@ -447,12 +138,12 @@ container_color: haproxy-bundle-docker-1 allocation score on overcloud-controlle
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
-container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
+container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
+container_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
@@ -460,69 +151,6 @@ container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompu
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
@@ -551,135 +179,48 @@ container_color: haproxy-bundle-docker-2 allocation score on overcloud-novacompu
 container_color: haproxy-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
 container_color: haproxy-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: openstack-cinder-backup allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-backup allocation score on galera-bundle-1: -INFINITY
-container_color: openstack-cinder-backup allocation score on galera-bundle-2: -INFINITY
 container_color: openstack-cinder-backup allocation score on overcloud-controller-0: 0
 container_color: openstack-cinder-backup allocation score on overcloud-controller-1: 0
 container_color: openstack-cinder-backup allocation score on overcloud-controller-2: 0
 container_color: openstack-cinder-backup allocation score on overcloud-novacompute-0: -INFINITY
-container_color: openstack-cinder-backup allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-backup allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: openstack-cinder-backup allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: openstack-cinder-backup allocation score on redis-bundle-0: -INFINITY
-container_color: openstack-cinder-backup allocation score on redis-bundle-1: -INFINITY
-container_color: openstack-cinder-backup allocation score on redis-bundle-2: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: openstack-cinder-backup-docker-0 allocation score on overcloud-controller-0: 0
 container_color: openstack-cinder-backup-docker-0 allocation score on overcloud-controller-1: INFINITY
 container_color: openstack-cinder-backup-docker-0 allocation score on overcloud-controller-2: 0
 container_color: openstack-cinder-backup-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: openstack-cinder-backup-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-1: -INFINITY
-container_color: openstack-cinder-volume allocation score on galera-bundle-2: -INFINITY
 container_color: openstack-cinder-volume allocation score on overcloud-controller-0: 0
 container_color: openstack-cinder-volume allocation score on overcloud-controller-1: 0
 container_color: openstack-cinder-volume allocation score on overcloud-controller-2: 0
 container_color: openstack-cinder-volume allocation score on overcloud-novacompute-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: openstack-cinder-volume allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-0: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-1: -INFINITY
-container_color: openstack-cinder-volume allocation score on redis-bundle-2: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: openstack-cinder-volume-docker-0 allocation score on overcloud-controller-1: 0
 container_color: openstack-cinder-volume-docker-0 allocation score on overcloud-controller-2: 0
 container_color: openstack-cinder-volume-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-2: -INFINITY
 container_color: rabbitmq-bundle allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle allocation score on overcloud-controller-2: 0
 container_color: rabbitmq-bundle allocation score on overcloud-novacompute-0: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on overcloud-controller-0: INFINITY
 container_color: rabbitmq-bundle-0 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-0 allocation score on overcloud-controller-2: 0
 container_color: rabbitmq-bundle-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-1 allocation score on overcloud-controller-1: INFINITY
 container_color: rabbitmq-bundle-1 allocation score on overcloud-controller-2: 0
 container_color: rabbitmq-bundle-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-2 allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-2 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-2 allocation score on overcloud-controller-2: INFINITY
 container_color: rabbitmq-bundle-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-clone allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-clone allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-clone allocation score on overcloud-controller-2: 0
 container_color: rabbitmq-bundle-clone allocation score on overcloud-novacompute-0: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: 0
-container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: 0
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-0: -INFINITY
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-1: -INFINITY
+container_color: rabbitmq-bundle-clone allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-2: 0
@@ -691,179 +232,53 @@ container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controll
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-2: 0
 container_color: rabbitmq-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-0: 0
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-1: 0
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
 container_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: rabbitmq:0 allocation score on overcloud-controller-0: 0
-container_color: rabbitmq:0 allocation score on overcloud-controller-1: 0
-container_color: rabbitmq:0 allocation score on overcloud-controller-2: 0
-container_color: rabbitmq:0 allocation score on overcloud-novacompute-0: 0
 container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-container_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: 0
-container_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: 0
-container_color: rabbitmq:1 allocation score on overcloud-controller-0: 0
-container_color: rabbitmq:1 allocation score on overcloud-controller-1: 0
-container_color: rabbitmq:1 allocation score on overcloud-controller-2: 0
-container_color: rabbitmq:1 allocation score on overcloud-novacompute-0: 0
-container_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: 0
 container_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-container_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: 0
-container_color: rabbitmq:2 allocation score on overcloud-controller-0: 0
-container_color: rabbitmq:2 allocation score on overcloud-controller-1: 0
-container_color: rabbitmq:2 allocation score on overcloud-controller-2: 0
-container_color: rabbitmq:2 allocation score on overcloud-novacompute-0: 0
-container_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: 0
-container_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: 0
 container_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
-container_color: redis-bundle allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle allocation score on overcloud-controller-0: 0
 container_color: redis-bundle allocation score on overcloud-controller-1: 0
 container_color: redis-bundle allocation score on overcloud-controller-2: 0
 container_color: redis-bundle allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-0 allocation score on overcloud-controller-0: INFINITY
 container_color: redis-bundle-0 allocation score on overcloud-controller-1: 0
 container_color: redis-bundle-0 allocation score on overcloud-controller-2: 0
 container_color: redis-bundle-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-1 allocation score on overcloud-controller-0: 0
 container_color: redis-bundle-1 allocation score on overcloud-controller-1: INFINITY
 container_color: redis-bundle-1 allocation score on overcloud-controller-2: 0
 container_color: redis-bundle-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-2 allocation score on overcloud-controller-0: 0
 container_color: redis-bundle-2 allocation score on overcloud-controller-1: 0
 container_color: redis-bundle-2 allocation score on overcloud-controller-2: INFINITY
 container_color: redis-bundle-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 container_color: redis-bundle-docker-0 allocation score on overcloud-controller-1: 0
 container_color: redis-bundle-docker-0 allocation score on overcloud-controller-2: 0
 container_color: redis-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-1 allocation score on overcloud-controller-0: 0
 container_color: redis-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 container_color: redis-bundle-docker-1 allocation score on overcloud-controller-2: 0
 container_color: redis-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-docker-2 allocation score on overcloud-controller-0: 0
 container_color: redis-bundle-docker-2 allocation score on overcloud-controller-1: 0
 container_color: redis-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 container_color: redis-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-container_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-1: -INFINITY
-container_color: redis-bundle-master allocation score on galera-bundle-2: -INFINITY
 container_color: redis-bundle-master allocation score on overcloud-controller-0: 0
 container_color: redis-bundle-master allocation score on overcloud-controller-1: 0
 container_color: redis-bundle-master allocation score on overcloud-controller-2: 0
 container_color: redis-bundle-master allocation score on overcloud-novacompute-0: 0
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis-bundle-master allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-0: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-1: -INFINITY
 container_color: redis-bundle-master allocation score on redis-bundle-2: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:0 allocation score on overcloud-controller-0: 0
-container_color: redis:0 allocation score on overcloud-controller-1: 0
-container_color: redis:0 allocation score on overcloud-controller-2: 0
-container_color: redis:0 allocation score on overcloud-novacompute-0: 0
-container_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis:0 allocation score on rabbitmq-bundle-2: -INFINITY
 container_color: redis:0 allocation score on redis-bundle-0: INFINITY
-container_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-container_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:1 allocation score on overcloud-controller-0: 0
-container_color: redis:1 allocation score on overcloud-controller-1: 0
-container_color: redis:1 allocation score on overcloud-controller-2: 0
-container_color: redis:1 allocation score on overcloud-novacompute-0: 0
-container_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis:1 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis:1 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 container_color: redis:1 allocation score on redis-bundle-1: INFINITY
-container_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-container_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-container_color: redis:2 allocation score on overcloud-controller-0: 0
-container_color: redis:2 allocation score on overcloud-controller-1: 0
-container_color: redis:2 allocation score on overcloud-controller-2: 0
-container_color: redis:2 allocation score on overcloud-novacompute-0: 0
-container_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-container_color: redis:2 allocation score on rabbitmq-bundle-1: -INFINITY
-container_color: redis:2 allocation score on rabbitmq-bundle-2: -INFINITY
-container_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-container_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 container_color: redis:2 allocation score on redis-bundle-2: INFINITY
 galera:0 promotion score on galera-bundle-0: 100
 galera:1 promotion score on galera-bundle-1: 100
@@ -875,239 +290,77 @@ native_color: fence1 allocation score on overcloud-novacompute-0: -INFINITY
 native_color: fence1 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: fence1 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: fence1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-0 allocation score on overcloud-controller-0: INFINITY
 native_color: galera-bundle-0 allocation score on overcloud-controller-1: 0
 native_color: galera-bundle-0 allocation score on overcloud-controller-2: 0
 native_color: galera-bundle-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-1 allocation score on overcloud-controller-0: 0
 native_color: galera-bundle-1 allocation score on overcloud-controller-1: INFINITY
 native_color: galera-bundle-1 allocation score on overcloud-controller-2: 0
 native_color: galera-bundle-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-2 allocation score on overcloud-controller-0: 0
 native_color: galera-bundle-2 allocation score on overcloud-controller-1: 0
 native_color: galera-bundle-2 allocation score on overcloud-controller-2: INFINITY
 native_color: galera-bundle-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 native_color: galera-bundle-docker-0 allocation score on overcloud-controller-1: 0
 native_color: galera-bundle-docker-0 allocation score on overcloud-controller-2: 0
 native_color: galera-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 native_color: galera-bundle-docker-1 allocation score on overcloud-controller-2: 0
 native_color: galera-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 native_color: galera-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-native_color: galera:0 allocation score on galera-bundle-1: -INFINITY
-native_color: galera:0 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:0 allocation score on overcloud-controller-0: -INFINITY
-native_color: galera:0 allocation score on overcloud-controller-1: -INFINITY
-native_color: galera:0 allocation score on overcloud-controller-2: -INFINITY
-native_color: galera:0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera:0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera:1 allocation score on galera-bundle-0: -INFINITY
 native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-native_color: galera:1 allocation score on galera-bundle-2: -INFINITY
-native_color: galera:1 allocation score on overcloud-controller-0: -INFINITY
-native_color: galera:1 allocation score on overcloud-controller-1: -INFINITY
-native_color: galera:1 allocation score on overcloud-controller-2: -INFINITY
-native_color: galera:1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-0: -INFINITY
-native_color: galera:2 allocation score on galera-bundle-1: -INFINITY
 native_color: galera:2 allocation score on galera-bundle-2: INFINITY
-native_color: galera:2 allocation score on overcloud-controller-0: -INFINITY
-native_color: galera:2 allocation score on overcloud-controller-1: -INFINITY
-native_color: galera:2 allocation score on overcloud-controller-2: -INFINITY
-native_color: galera:2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: galera:2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: INFINITY
+native_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-1: 0
+native_color: haproxy-bundle-docker-0 allocation score on overcloud-controller-2: 0
 native_color: haproxy-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 native_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: INFINITY
+native_color: haproxy-bundle-docker-1 allocation score on overcloud-controller-2: 0
 native_color: haproxy-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 native_color: haproxy-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-native_color: haproxy-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-native_color: ip-10.0.0.7 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-10.0.0.7 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-10.0.0.7 allocation score on galera-bundle-2: -INFINITY
 native_color: ip-10.0.0.7 allocation score on overcloud-controller-0: 0
 native_color: ip-10.0.0.7 allocation score on overcloud-controller-1: INFINITY
 native_color: ip-10.0.0.7 allocation score on overcloud-controller-2: 0
 native_color: ip-10.0.0.7 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: ip-10.0.0.7 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-10.0.0.7 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-10.0.0.7 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-10.0.0.7 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-10.0.0.7 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-10.0.0.7 allocation score on redis-bundle-2: -INFINITY
-native_color: ip-172.16.1.9 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.16.1.9 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.16.1.9 allocation score on galera-bundle-2: -INFINITY
 native_color: ip-172.16.1.9 allocation score on overcloud-controller-0: 0
 native_color: ip-172.16.1.9 allocation score on overcloud-controller-1: INFINITY
 native_color: ip-172.16.1.9 allocation score on overcloud-controller-2: 0
 native_color: ip-172.16.1.9 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: ip-172.16.1.9 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.16.1.9 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.16.1.9 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.16.1.9 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.16.1.9 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.16.1.9 allocation score on redis-bundle-2: -INFINITY
-native_color: ip-172.16.2.4 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.16.2.4 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.16.2.4 allocation score on galera-bundle-2: -INFINITY
 native_color: ip-172.16.2.4 allocation score on overcloud-controller-0: 0
 native_color: ip-172.16.2.4 allocation score on overcloud-controller-1: 0
 native_color: ip-172.16.2.4 allocation score on overcloud-controller-2: INFINITY
 native_color: ip-172.16.2.4 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: ip-172.16.2.4 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.16.2.4 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.16.2.4 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.16.2.4 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.16.2.4 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.16.2.4 allocation score on redis-bundle-2: -INFINITY
-native_color: ip-172.16.2.8 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.16.2.8 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.16.2.8 allocation score on galera-bundle-2: -INFINITY
 native_color: ip-172.16.2.8 allocation score on overcloud-controller-0: INFINITY
 native_color: ip-172.16.2.8 allocation score on overcloud-controller-1: 0
 native_color: ip-172.16.2.8 allocation score on overcloud-controller-2: 0
 native_color: ip-172.16.2.8 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: ip-172.16.2.8 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.16.2.8 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.16.2.8 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.16.2.8 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.16.2.8 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.16.2.8 allocation score on redis-bundle-2: -INFINITY
-native_color: ip-172.16.3.9 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-172.16.3.9 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-172.16.3.9 allocation score on galera-bundle-2: -INFINITY
 native_color: ip-172.16.3.9 allocation score on overcloud-controller-0: 0
 native_color: ip-172.16.3.9 allocation score on overcloud-controller-1: 0
 native_color: ip-172.16.3.9 allocation score on overcloud-controller-2: INFINITY
 native_color: ip-172.16.3.9 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: ip-172.16.3.9 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-172.16.3.9 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-172.16.3.9 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-172.16.3.9 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-172.16.3.9 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-172.16.3.9 allocation score on redis-bundle-2: -INFINITY
-native_color: ip-192.168.24.9 allocation score on galera-bundle-0: -INFINITY
-native_color: ip-192.168.24.9 allocation score on galera-bundle-1: -INFINITY
-native_color: ip-192.168.24.9 allocation score on galera-bundle-2: -INFINITY
 native_color: ip-192.168.24.9 allocation score on overcloud-controller-0: INFINITY
 native_color: ip-192.168.24.9 allocation score on overcloud-controller-1: 0
 native_color: ip-192.168.24.9 allocation score on overcloud-controller-2: 0
 native_color: ip-192.168.24.9 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: ip-192.168.24.9 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: ip-192.168.24.9 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: ip-192.168.24.9 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: ip-192.168.24.9 allocation score on redis-bundle-0: -INFINITY
-native_color: ip-192.168.24.9 allocation score on redis-bundle-1: -INFINITY
-native_color: ip-192.168.24.9 allocation score on redis-bundle-2: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: openstack-cinder-backup-docker-0 allocation score on overcloud-controller-0: 0
 native_color: openstack-cinder-backup-docker-0 allocation score on overcloud-controller-1: INFINITY
 native_color: openstack-cinder-backup-docker-0 allocation score on overcloud-controller-2: 0
 native_color: openstack-cinder-backup-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: openstack-cinder-backup-docker-0 allocation score on redis-bundle-2: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on overcloud-controller-0: INFINITY
 native_color: openstack-cinder-volume-docker-0 allocation score on overcloud-controller-1: 0
 native_color: openstack-cinder-volume-docker-0 allocation score on overcloud-controller-2: 0
 native_color: openstack-cinder-volume-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: openstack-cinder-volume-docker-0 allocation score on redis-bundle-2: -INFINITY
 native_color: overcloud-novacompute-0 allocation score on overcloud-controller-0: -INFINITY
 native_color: overcloud-novacompute-0 allocation score on overcloud-controller-1: -INFINITY
 native_color: overcloud-novacompute-0 allocation score on overcloud-controller-2: -INFINITY
@@ -1119,23 +372,17 @@ native_color: rabbitmq-bundle-0 allocation score on overcloud-controller-0: INFI
 native_color: rabbitmq-bundle-0 allocation score on overcloud-controller-1: 0
 native_color: rabbitmq-bundle-0 allocation score on overcloud-controller-2: 0
 native_color: rabbitmq-bundle-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on overcloud-controller-0: 0
 native_color: rabbitmq-bundle-1 allocation score on overcloud-controller-1: INFINITY
 native_color: rabbitmq-bundle-1 allocation score on overcloud-controller-2: 0
 native_color: rabbitmq-bundle-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-controller-0: 0
 native_color: rabbitmq-bundle-2 allocation score on overcloud-controller-1: 0
 native_color: rabbitmq-bundle-2 allocation score on overcloud-controller-2: INFINITY
 native_color: rabbitmq-bundle-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-1: 0
 native_color: rabbitmq-bundle-docker-0 allocation score on overcloud-controller-2: 0
@@ -1147,153 +394,42 @@ native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-controller-2: 0
 native_color: rabbitmq-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-controller-0: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-controller-1: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-controller-2: -INFINITY
-native_color: rabbitmq:0 allocation score on overcloud-novacompute-0: -INFINITY
 native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-native_color: rabbitmq:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: rabbitmq:0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-controller-0: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-controller-1: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-controller-2: -INFINITY
-native_color: rabbitmq:1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq:1 allocation score on rabbitmq-bundle-0: -INFINITY
 native_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-native_color: rabbitmq:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-controller-0: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-controller-1: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-controller-2: -INFINITY
-native_color: rabbitmq:2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: rabbitmq:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: rabbitmq:2 allocation score on rabbitmq-bundle-1: -INFINITY
 native_color: rabbitmq:2 allocation score on rabbitmq-bundle-2: INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-0 allocation score on overcloud-controller-0: INFINITY
 native_color: redis-bundle-0 allocation score on overcloud-controller-1: 0
 native_color: redis-bundle-0 allocation score on overcloud-controller-2: 0
 native_color: redis-bundle-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-1 allocation score on overcloud-controller-0: 0
 native_color: redis-bundle-1 allocation score on overcloud-controller-1: INFINITY
 native_color: redis-bundle-1 allocation score on overcloud-controller-2: 0
 native_color: redis-bundle-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis-bundle-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-2 allocation score on overcloud-controller-0: 0
 native_color: redis-bundle-2 allocation score on overcloud-controller-1: 0
 native_color: redis-bundle-2 allocation score on overcloud-controller-2: INFINITY
 native_color: redis-bundle-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis-bundle-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-0 allocation score on overcloud-controller-0: INFINITY
 native_color: redis-bundle-docker-0 allocation score on overcloud-controller-1: 0
 native_color: redis-bundle-docker-0 allocation score on overcloud-controller-2: 0
 native_color: redis-bundle-docker-0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on overcloud-controller-0: -INFINITY
 native_color: redis-bundle-docker-1 allocation score on overcloud-controller-1: INFINITY
 native_color: redis-bundle-docker-1 allocation score on overcloud-controller-2: 0
 native_color: redis-bundle-docker-1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on galera-bundle-2: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on overcloud-controller-0: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on overcloud-controller-1: -INFINITY
 native_color: redis-bundle-docker-2 allocation score on overcloud-controller-2: INFINITY
 native_color: redis-bundle-docker-2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-1: -INFINITY
-native_color: redis-bundle-docker-2 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:0 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:0 allocation score on overcloud-controller-0: -INFINITY
-native_color: redis:0 allocation score on overcloud-controller-1: -INFINITY
-native_color: redis:0 allocation score on overcloud-controller-2: -INFINITY
-native_color: redis:0 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis:0 allocation score on rabbitmq-bundle-2: -INFINITY
 native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-native_color: redis:0 allocation score on redis-bundle-1: -INFINITY
-native_color: redis:0 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:1 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:1 allocation score on overcloud-controller-0: -INFINITY
-native_color: redis:1 allocation score on overcloud-controller-1: -INFINITY
-native_color: redis:1 allocation score on overcloud-controller-2: -INFINITY
-native_color: redis:1 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis:1 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis:1 allocation score on redis-bundle-0: -INFINITY
 native_color: redis:1 allocation score on redis-bundle-1: INFINITY
-native_color: redis:1 allocation score on redis-bundle-2: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-0: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-1: -INFINITY
-native_color: redis:2 allocation score on galera-bundle-2: -INFINITY
-native_color: redis:2 allocation score on overcloud-controller-0: -INFINITY
-native_color: redis:2 allocation score on overcloud-controller-1: -INFINITY
-native_color: redis:2 allocation score on overcloud-controller-2: -INFINITY
-native_color: redis:2 allocation score on overcloud-novacompute-0: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-0: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-1: -INFINITY
-native_color: redis:2 allocation score on rabbitmq-bundle-2: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-0: -INFINITY
-native_color: redis:2 allocation score on redis-bundle-1: -INFINITY
 native_color: redis:2 allocation score on redis-bundle-2: INFINITY
 redis:0 promotion score on redis-bundle-0: 1
 redis:1 promotion score on redis-bundle-1: 1
-- 
1.8.3.1


From e1e81ae8802296987c2b956946e00437471e24a4 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 23 Oct 2017 14:14:11 +1100
Subject: [PATCH 3/6] Fix: PE: Consolidate REMOTE_CONTAINER_HACK logic

---
 include/crm/pengine/internal.h          |  3 +-
 lib/pengine/container.c                 | 99 +++++++++++++++++++++++++++++++++
 lib/pengine/utils.c                     | 44 ++-------------
 pengine/container.c                     | 23 +++-----
 pengine/test10/bundle-probe-order-2.xml |  4 +-
 5 files changed, 114 insertions(+), 59 deletions(-)

diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h
index 70dd7c7..97ec8c3 100644
--- a/include/crm/pengine/internal.h
+++ b/include/crm/pengine/internal.h
@@ -297,7 +297,8 @@ node_t *pe_create_node(const char *id, const char *uname, const char *type,
 bool remote_id_conflict(const char *remote_name, pe_working_set_t *data);
 void common_print(resource_t * rsc, const char *pre_text, const char *name, node_t *node, long options, void *print_data);
 resource_t *find_container_child(const char *stem, resource_t * rsc, node_t *node);
-bool fix_remote_addr(resource_t * rsc);
+bool container_fix_remote_addr(resource_t *rsc);
+const char *container_fix_remote_addr_in(resource_t *rsc, xmlNode *xml, const char *field);
 const char *pe_node_attribute_calculated(pe_node_t *node, const char *name, resource_t *rsc);
 const char *pe_node_attribute_raw(pe_node_t *node, const char *name);
 
diff --git a/lib/pengine/container.c b/lib/pengine/container.c
index b66c57d..d25d5a9 100644
--- a/lib/pengine/container.c
+++ b/lib/pengine/container.c
@@ -718,6 +718,105 @@ static void port_free(container_port_t *port)
     free(port);
 }
 
+static container_grouping_t *
+tuple_for_remote(resource_t *remote) 
+{
+    resource_t *top = remote;
+    container_variant_data_t *container_data = NULL;
+
+    if (top == NULL) {
+        return NULL;
+    }
+
+    while (top->parent != NULL) {
+        top = top->parent;
+    }
+
+    get_container_variant_data(container_data, top);
+    for (GListPtr gIter = container_data->tuples; gIter != NULL; gIter = gIter->next) {
+        container_grouping_t *tuple = (container_grouping_t *)gIter->data;
+        if(tuple->remote == remote) {
+            return tuple;
+        }
+    }
+    CRM_LOG_ASSERT(FALSE);
+    return NULL;
+}
+
+bool
+container_fix_remote_addr(resource_t *rsc) 
+{
+    const char *name;
+    const char *value;
+    const char *attr_list[] = {
+        XML_ATTR_TYPE,
+        XML_AGENT_ATTR_CLASS,
+        XML_AGENT_ATTR_PROVIDER
+    };
+    const char *value_list[] = {
+        "remote",
+        PCMK_RESOURCE_CLASS_OCF,
+        "pacemaker"
+    };
+
+    if(rsc == NULL) {
+        return FALSE;
+    }
+
+    name = "addr";
+    value = g_hash_table_lookup(rsc->parameters, name);
+    if (safe_str_eq(value, "#uname") == FALSE) {
+        return FALSE;
+    }
+
+    for (int lpc = 0; lpc < DIMOF(attr_list); lpc++) {
+        name = attr_list[lpc];
+        value = crm_element_value(rsc->xml, attr_list[lpc]);
+        if (safe_str_eq(value, value_list[lpc]) == FALSE) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+const char *
+container_fix_remote_addr_in(resource_t *rsc, xmlNode *xml, const char *field) 
+{
+    // REMOTE_CONTAINER_HACK: Allow remote nodes that start containers with pacemaker remote inside
+
+    pe_node_t *node = NULL;
+    container_grouping_t *tuple = NULL;
+
+    if(container_fix_remote_addr(rsc) == FALSE) {
+        return NULL;
+    }
+
+    tuple = tuple_for_remote(rsc);
+    if(tuple == NULL) {
+        return NULL;
+    }
+
+    node = tuple->docker->allocated_to;
+    if(node == NULL && tuple->docker->running_on) {
+        /* If it wont be running anywhere after the
+         * transition, go with where it's running now.
+         */
+        node = tuple->docker->running_on->data;
+    }
+
+    if(node == NULL) {
+        crm_trace("Cannot fix address for %s", tuple->remote->id);
+        return NULL;
+    }
+
+    crm_trace("Fixing addr for %s on %s", rsc->id, node->details->uname);
+    if(xml != NULL && field != NULL) {
+        crm_xml_add(xml, field, node->details->uname);
+    }
+
+    return node->details->uname;
+}
+
 gboolean
 container_unpack(resource_t * rsc, pe_working_set_t * data_set)
 {
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index d9cace2..272fa16 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -949,42 +1836,6 @@ filter_parameters(xmlNode * param_set, const char *param_string, bool need_prese
     }
 }
 
-bool fix_remote_addr(resource_t * rsc)
-{
-    const char *name;
-    const char *value;
-    const char *attr_list[] = {
-        XML_ATTR_TYPE,
-        XML_AGENT_ATTR_CLASS,
-        XML_AGENT_ATTR_PROVIDER
-    };
-    const char *value_list[] = {
-        "remote",
-        "ocf",
-        "pacemaker"
-    };
-
-    if(rsc == NULL) {
-        return FALSE;
-    }
-
-    name = "addr";
-    value = g_hash_table_lookup(rsc->parameters, name);
-    if (safe_str_eq(value, "#uname") == FALSE) {
-        return FALSE;
-    }
-
-    for (int lpc = 0; lpc < DIMOF(attr_list); lpc++) {
-        name = attr_list[lpc];
-        value = crm_element_value(rsc->xml, attr_list[lpc]);
-        if (safe_str_eq(value, value_list[lpc]) == FALSE) {
-            return FALSE;
-        }
-    }
-
-    return TRUE;
-}
-
 static op_digest_cache_t *
 rsc_action_digest(resource_t * rsc, const char *task, const char *key,
                   node_t * node, xmlNode * xml_op, pe_working_set_t * data_set) 
@@ -2009,10 +1881,10 @@ rsc_action_digest(resource_t * rsc, const char *task, const char *key,
         //pe_get_versioned_attributes(local_versioned_params, rsc, node, data_set);
 
         data->params_all = create_xml_node(NULL, XML_TAG_PARAMS);
-        if (fix_remote_addr(rsc)) {
-            // REMOTE_CONTAINER_HACK: Allow remote nodes that start containers with pacemaker remote inside
-            crm_xml_add(data->params_all, "addr", node->details->uname);
-            crm_trace("Fixing addr for %s on %s", rsc->id, node->details->uname);
+
+        // REMOTE_CONTAINER_HACK: Allow remote nodes that start containers with pacemaker remote inside
+        if (container_fix_remote_addr_in(rsc, data->params_all, "addr")) {
+            crm_trace("Fixed addr for %s on %s", rsc->id, node->details->uname);
         }
 
         g_hash_table_foreach(local_rsc_params, hash2field, data->params_all);
diff --git a/pengine/container.c b/pengine/container.c
index a884516..13ce155 100644
--- a/pengine/container.c
+++ b/pengine/container.c
@@ -824,25 +824,16 @@ container_expand(resource_t * rsc, pe_working_set_t * data_set)
         container_grouping_t *tuple = (container_grouping_t *)gIter->data;
 
         CRM_ASSERT(tuple);
-        if (tuple->remote && tuple->docker && fix_remote_addr(tuple->remote)) {
-
+        if (tuple->remote && tuple->docker && container_fix_remote_addr(tuple->remote)) {
             // REMOTE_CONTAINER_HACK: Allow remote nodes that start containers with pacemaker remote inside
-            pe_node_t *node = tuple->docker->allocated_to;
             xmlNode *nvpair = get_xpath_object("//nvpair[@name='addr']", tuple->remote->xml, LOG_ERR);
+            const char *calculated_addr = container_fix_remote_addr_in(tuple->remote, nvpair, "value");
 
-            if(node == NULL && tuple->docker->running_on) {
-                /* If it wont be running anywhere after the
-                 * transition, go with where it's running now.
-                 */
-                node = tuple->docker->running_on->data;
-            }
-
-            if(node != NULL) {
-                g_hash_table_replace(tuple->remote->parameters, strdup("addr"), strdup(node->details->uname));
-                crm_xml_add(nvpair, "value", node->details->uname);
-
-            } else if(fix_remote_addr(tuple->remote)) {
-                crm_trace("Cannot fix address for %s", tuple->remote->id);
+            if (calculated_addr) {
+                crm_trace("Fixed addr for %s on %s", tuple->remote->id, calculated_addr);
+                g_hash_table_replace(tuple->remote->parameters, strdup("addr"), strdup(calculated_addr));
+            } else {
+                crm_err("Could not fix addr for %s", tuple->remote->id);
             }
         }
         if(tuple->ip) {
diff --git a/pengine/test10/bundle-probe-order-2.xml b/pengine/test10/bundle-probe-order-2.xml
index e5a3959..2e26033 100644
--- a/pengine/test10/bundle-probe-order-2.xml
+++ b/pengine/test10/bundle-probe-order-2.xml
@@ -102,8 +102,8 @@
       <lrm id="2">
         <lrm_resources>
           <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_failure_0" operation_key="galera-bundle-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="0" queue-time="0"  op-digest="b453de0dc04a6db30bbf86d12fee7dca"/>
-            <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="0" queue-time="0" op-force-restart=" server " op-digest="b453de0dc04a6db30bbf86d12fee7dca"/>
+            <lrm_rsc_op id="galera-bundle-0_last_failure_0" operation_key="galera-bundle-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="0" queue-time="0"  op-digest="9f3901600fcaa04276113ecd13872e61"/>
+            <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="0" queue-time="0" op-force-restart=" server " op-digest="9f3901600fcaa04276113ecd13872e61"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="galera-bundle-docker-0_last_failure_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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="22ac554c0c3ba5fdd85d5f4134db6003"/>
-- 
1.8.3.1


From 40aaa36500185f9f1c79925aa1fd28b89c85d89a Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 23 Oct 2017 14:15:43 +1100
Subject: [PATCH 4/6] Fix: PE: Do not always expire failed operations of nested
 remotes

We don't want to expire the remote connection failures automatically
based on attribute changes when the remote connection is stopped because
the addr=#uname logic triggers far too many false positives.
---
 lib/pengine/unpack.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
index 6436cb8..6ac58dd 100644
--- a/lib/pengine/unpack.c
+++ b/lib/pengine/unpack.c
@@ -2907,6 +2907,10 @@ static bool check_operation_expiry(resource_t *rsc, node_t *node, int rc, xmlNod
         if (digest_data->rc == RSC_DIGEST_UNKNOWN) {
             crm_trace("rsc op %s/%s on node %s does not have a op digest to compare against", rsc->id,
                       key, node->details->id);
+        } else if(container_fix_remote_addr(rsc) && digest_data->rc != RSC_DIGEST_MATCH) {
+            // We can't sanely check the changing 'addr' attribute. Yet
+            crm_trace("Ignoring rsc op %s/%s on node %s", rsc->id, key, node->details->id);
+
         } else if (digest_data->rc != RSC_DIGEST_MATCH) {
             clear_reason = "resource parameters have changed";
         }
-- 
1.8.3.1


From b4321a7c2ca814346d3b97a0e7b6c0915d6633a4 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 23 Oct 2017 16:47:53 +1100
Subject: [PATCH 5/6] Fix: PE: There is no need for port mapping directives
 when net=host is specified

---
 lib/pengine/container.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pengine/container.c b/lib/pengine/container.c
index d25d5a9..f1f66a5 100644
--- a/lib/pengine/container.c
+++ b/lib/pengine/container.c
@@ -254,7 +254,8 @@ create_docker_resource(
             if(tuple->ipaddr) {
                 offset += snprintf(buffer+offset, max-offset, " -p %s:%s:%s",
                                    tuple->ipaddr, port->source, port->target);
-            } else {
+            } else if(safe_str_neq(data->docker_network, "host")) {
+                // No need to do port mapping if net=host
                 offset += snprintf(buffer+offset, max-offset, " -p %s:%s", port->source, port->target);
             }
         }
-- 
1.8.3.1


From 929ed9b8ed9e970b0dfa24533b5873f943295153 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Mon, 23 Oct 2017 16:48:07 +1100
Subject: [PATCH 6/6] Test: PE: There is no need for port mapping directives
 when net=host is specified

---
 pengine/test10/bundle-nested-colocation.exp     | 18 ++++----
 pengine/test10/bundle-order-fencing.exp         |  6 +--
 pengine/test10/bundle-order-fencing.xml         | 24 +++++-----
 pengine/test10/bundle-order-partial-start-2.exp |  6 +--
 pengine/test10/bundle-order-partial-start-2.xml | 12 ++---
 pengine/test10/bundle-order-partial-start.exp   |  6 +--
 pengine/test10/bundle-order-partial-start.xml   |  8 ++--
 pengine/test10/bundle-order-partial-stop.exp    |  6 +--
 pengine/test10/bundle-order-startup-clone-2.exp | 60 ++++++++++++-------------
 pengine/test10/bundle-order-startup-clone.exp   | 16 +++----
 pengine/test10/bundle-order-startup.exp         | 18 ++++----
 pengine/test10/bundle-order-stop-clone.exp      |  2 +-
 pengine/test10/bundle-order-stop-clone.xml      | 24 +++++-----
 pengine/test10/bundle-order-stop.exp            |  6 +--
 pengine/test10/bundle-probe-order-1.exp         | 18 ++++----
 pengine/test10/bundle-probe-order-2.exp         | 10 ++---
 pengine/test10/bundle-probe-order-2.xml         |  4 +-
 pengine/test10/bundle-probe-order-3.exp         | 10 ++---
 pengine/test10/bundle-probe-order-3.xml         |  4 +-
 pengine/test10/remote-fence-unclean-3.xml       | 36 +++++++--------
 20 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/pengine/test10/bundle-nested-colocation.exp b/pengine/test10/bundle-nested-colocation.exp
index fe77003..315c4be 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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
index c4e4ec1..c32e834 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 -p 3122:3122 --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 --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>
@@ -559,7 +559,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 -p 3123:3123 --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 --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>
@@ -1419,7 +1419,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 -p 3124:3124 --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 --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>
diff --git a/pengine/test10/bundle-order-fencing.xml b/pengine/test10/bundle-order-fencing.xml
index b303116..96eba09 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="f50186d9782ae0addf8521a6f507c881"/>
-            <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="561b6847afca6bfbe64a925fc8f9a586"/>
+            <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_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="d389b2daff811fe7a1fa6943a5e18b34"/>
-            <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="08059ef72be0f8f883ba84c83b6492b6"/>
+            <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_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"/>
@@ -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="1cd67d814d23e799920dcc7f0f89d1ff"/>
-            <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="65886fe28262ef6210fac116dd630079"/>
+            <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_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="c15ee65856a09285286dcaf670b8efbe"/>
-            <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="7362022405a27cc898617c0751e68e51"/>
+            <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_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="bf832eda4aa91b107d859f72dc02f785"/>
-            <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="fd68fffbb8bc0dbaef13c9da7cb7e9d3"/>
+            <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_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_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="90b7b2b5826b874d7be1cb44875d1ef5"/>
-            <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="69fc3d0046f36c83a2a1238d00446bbd"/>
+            <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_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 c253553..cea15dd 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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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>
diff --git a/pengine/test10/bundle-order-partial-start-2.xml b/pengine/test10/bundle-order-partial-start-2.xml
index 9c4d40c..26fccf0 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="50baee2f0a77a08b0616f0cf07ab724b"/>
-            <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="25cb53ea3977a912bf4c0f70fe9e3c21"/>
+            <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_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="ed3aad657e7994e60ac4dbd3a200b0b7"/>
-            <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="f7e456f82e276e07f726e6e86e93bbb3"/>
+            <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_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="90ccdc75136c9ebfb1985f14df781477"/>
-            <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="81e9d490c493f8d22fab2822ec0bed8a"/>
+            <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_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"/>
diff --git a/pengine/test10/bundle-order-partial-start.exp b/pengine/test10/bundle-order-partial-start.exp
index 21012ce..d21193a 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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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/>
diff --git a/pengine/test10/bundle-order-partial-start.xml b/pengine/test10/bundle-order-partial-start.xml
index 907dbfb..9b28b0d 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="50baee2f0a77a08b0616f0cf07ab724b"/>
-            <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="25cb53ea3977a912bf4c0f70fe9e3c21"/>
+            <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_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="90ccdc75136c9ebfb1985f14df781477"/>
-            <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="81e9d490c493f8d22fab2822ec0bed8a"/>
+            <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_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"/>
diff --git a/pengine/test10/bundle-order-partial-stop.exp b/pengine/test10/bundle-order-partial-stop.exp
index 0bd404a..f73a046 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 -p 3121:3121 --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 --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 -p 3123:3123 --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 --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 -p 3124:3124 --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 --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-clone-2.exp b/pengine/test10/bundle-order-startup-clone-2.exp
index 53ca437..709bf6c 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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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>
@@ -532,7 +532,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 -p 3123:3123 --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 --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/>
@@ -541,7 +541,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 -p 3123:3123 --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 --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/>
@@ -550,7 +550,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 -p 3123:3123 --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 --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/>
@@ -633,7 +633,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 -p 3123:3123 --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 --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>
@@ -646,7 +646,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 -p 3123:3123 --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 --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>
@@ -686,7 +686,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 -p 3123:3123 --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 --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/>
@@ -695,7 +695,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 -p 3123:3123 --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 --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/>
@@ -704,7 +704,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 -p 3123:3123 --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 --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/>
@@ -787,7 +787,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 -p 3123:3123 --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 --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>
@@ -800,7 +800,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 -p 3123:3123 --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 --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>
@@ -840,7 +840,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 -p 3123:3123 --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 --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/>
@@ -849,7 +849,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 -p 3123:3123 --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 --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/>
@@ -858,7 +858,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 -p 3123:3123 --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 --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/>
@@ -1732,7 +1732,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 -p 3124:3124 --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 --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>
@@ -1745,7 +1745,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 -p 3124:3124 --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 --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>
@@ -1785,7 +1785,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 -p 3124:3124 --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 --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/>
@@ -1794,7 +1794,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 -p 3124:3124 --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 --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/>
@@ -1803,7 +1803,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 -p 3124:3124 --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 --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/>
@@ -1886,7 +1886,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 -p 3124:3124 --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 --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>
@@ -1899,7 +1899,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 -p 3124:3124 --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 --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>
@@ -1939,7 +1939,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 -p 3124:3124 --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 --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/>
@@ -1948,7 +1948,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 -p 3124:3124 --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 --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/>
@@ -1957,7 +1957,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 -p 3124:3124 --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 --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/>
@@ -2040,7 +2040,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 -p 3124:3124 --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 --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>
@@ -2053,7 +2053,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 -p 3124:3124 --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 --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>
@@ -2093,7 +2093,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 -p 3124:3124 --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 --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/>
@@ -2102,7 +2102,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 -p 3124:3124 --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 --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/>
@@ -2111,7 +2111,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 -p 3124:3124 --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 --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 123f0e2..f4d61ee 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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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/>
@@ -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 -p 3124:3124 --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 --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 -p 3124:3124 --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 --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 -p 3124:3124 --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 --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 -p 3124:3124 --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 --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 -p 3124:3124 --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 --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 9ed9c3d..c025a41 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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3121:3121 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3124:3124 --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 --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 -p 3124:3124 --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 --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 -p 3124:3124 --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 --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-stop-clone.exp b/pengine/test10/bundle-order-stop-clone.exp
index 71e2bf7..92ca6de 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 -p 3123:3123 --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 --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>
diff --git a/pengine/test10/bundle-order-stop-clone.xml b/pengine/test10/bundle-order-stop-clone.xml
index 60db64d..87ed212 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="ed3aad657e7994e60ac4dbd3a200b0b7"/>
-            <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="f7e456f82e276e07f726e6e86e93bbb3"/>
+            <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_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"/>
@@ -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="90ccdc75136c9ebfb1985f14df781477"/>
-            <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="81e9d490c493f8d22fab2822ec0bed8a"/>
+            <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_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,8 +245,8 @@
             <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="810c6ca70f61efcf84f03ce4ebf1583e"/>
-            <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="9d23f939271b60f65c5d55115613887d"/>
+            <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_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"/>
@@ -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="029dcdb8e6d039453207529ddf76e626"/>
-            <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="d37abb44bbe352fe0b7d7664151cc6ab"/>
+            <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_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="d382f6658eb81d66313704072c2d9704"/>
-            <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="7c2c0a8373a43288eb9e4c59a8a11546"/>
+            <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_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"/>
@@ -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="78dfacba4be0b97e9a6426b342bb2fdd"/>
-            <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="24676507e61be2e5cc014443ba54c560"/>
+            <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_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 0bd404a..f73a046 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 -p 3121:3121 --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 --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 -p 3123:3123 --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 --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 -p 3124:3124 --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 --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-probe-order-1.exp b/pengine/test10/bundle-probe-order-1.exp
index 51d6d2e..e70680b 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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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 -p 3123:3123 --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 --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.exp b/pengine/test10/bundle-probe-order-2.exp
index 222ec81..f33da4d 100644
--- a/pengine/test10/bundle-probe-order-2.exp
+++ b/pengine/test10/bundle-probe-order-2.exp
@@ -12,7 +12,7 @@
     <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 -p 3123:3123 --user=root --log-driver=journald "/>
+        <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/>
@@ -30,7 +30,7 @@
     <action_set>
       <rsc_op id="3" 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 -p 3123:3123 --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 --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="8" 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 -p 3123:3123 --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 --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/>
@@ -48,7 +48,7 @@
     <action_set>
       <rsc_op id="5" 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 -p 3123:3123 --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 --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/>
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="1" 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 -p 3123:3123 --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 --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.xml b/pengine/test10/bundle-probe-order-2.xml
index 2e26033..014f117 100644
--- a/pengine/test10/bundle-probe-order-2.xml
+++ b/pengine/test10/bundle-probe-order-2.xml
@@ -106,8 +106,8 @@
             <lrm_rsc_op id="galera-bundle-0_last_0" operation_key="galera-bundle-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;8:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="0" queue-time="0" op-force-restart=" server " op-digest="9f3901600fcaa04276113ecd13872e61"/>
           </lrm_resource>
           <lrm_resource id="galera-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="galera-bundle-docker-0_last_failure_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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="22ac554c0c3ba5fdd85d5f4134db6003"/>
-            <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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="22ac554c0c3ba5fdd85d5f4134db6003"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_last_failure_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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="4f67aebfb93acd95d831f22d756f1fcf"/>
+            <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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="4f67aebfb93acd95d831f22d756f1fcf"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/bundle-probe-order-3.exp b/pengine/test10/bundle-probe-order-3.exp
index 5546bc9..e93434b 100644
--- a/pengine/test10/bundle-probe-order-3.exp
+++ b/pengine/test10/bundle-probe-order-3.exp
@@ -3,7 +3,7 @@
     <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 -p 3123:3123 --user=root --log-driver=journald "/>
+        <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/>
@@ -39,7 +39,7 @@
     <action_set>
       <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 -p 3123:3123 --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 --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="11" 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 -p 3123:3123 --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 --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/>
@@ -57,7 +57,7 @@
     <action_set>
       <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 -p 3123:3123 --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 --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="2" 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 -p 3123:3123 --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 --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.xml b/pengine/test10/bundle-probe-order-3.xml
index c33543e..72208db 100644
--- a/pengine/test10/bundle-probe-order-3.xml
+++ b/pengine/test10/bundle-probe-order-3.xml
@@ -96,8 +96,8 @@
       <lrm id="2">
         <lrm_resources>
           <lrm_resource id="galera-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="galera-bundle-docker-0_last_failure_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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="22ac554c0c3ba5fdd85d5f4134db6003"/>
-            <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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="22ac554c0c3ba5fdd85d5f4134db6003"/>
+            <lrm_rsc_op id="galera-bundle-docker-0_last_failure_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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="4f67aebfb93acd95d831f22d756f1fcf"/>
+            <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="7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" transition-magic="0:0;7:83:7:43285c5e-b25f-4c08-8e26-b680d050db82" on_node="centos2" call-id="80" rc-code="0" op-status="0" interval="0" last-run="1507793516" last-rc-change="1507793516" exec-time="135" queue-time="0" op-digest="4f67aebfb93acd95d831f22d756f1fcf"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/remote-fence-unclean-3.xml b/pengine/test10/remote-fence-unclean-3.xml
index 8856fc0..66a4d8b 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="0cb02c9a71c43ffdbc708a49566e14f0"/>
-            <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="af9ee4ff46f0c0d902e2806feb839fc5"/>
+            <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_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="d382f6658eb81d66313704072c2d9704"/>
-            <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="7c2c0a8373a43288eb9e4c59a8a11546"/>
+            <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_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="78dfacba4be0b97e9a6426b342bb2fdd"/>
-            <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="24676507e61be2e5cc014443ba54c560"/>
+            <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_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"/>
@@ -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="90d6c24a6c4e50413a8f5161b9e74aef"/>
-            <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="865f07bd3c8ca5d8cf7e768bcbd3c8ec"/>
+            <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_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="810c6ca70f61efcf84f03ce4ebf1583e"/>
-            <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="9d23f939271b60f65c5d55115613887d"/>
+            <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_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="029dcdb8e6d039453207529ddf76e626"/>
-            <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="d37abb44bbe352fe0b7d7664151cc6ab"/>
+            <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_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"/>
@@ -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="50baee2f0a77a08b0616f0cf07ab724b"/>
-            <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="25cb53ea3977a912bf4c0f70fe9e3c21"/>
+            <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_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="ed3aad657e7994e60ac4dbd3a200b0b7"/>
-            <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="f7e456f82e276e07f726e6e86e93bbb3"/>
+            <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_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="90ccdc75136c9ebfb1985f14df781477"/>
-            <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="81e9d490c493f8d22fab2822ec0bed8a"/>
+            <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_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"/>
-- 
1.8.3.1