diff --git a/.gitignore b/.gitignore
index 8a90331..1412d55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
SOURCES/nagios-agents-metadata-105ab8a.tar.gz
-SOURCES/pacemaker-2b07d5c.tar.gz
+SOURCES/pacemaker-c3c624e.tar.gz
diff --git a/.pacemaker.metadata b/.pacemaker.metadata
index 984e5a1..4ff0e33 100644
--- a/.pacemaker.metadata
+++ b/.pacemaker.metadata
@@ -1,2 +1,2 @@
ea6c0a27fd0ae8ce02f84a11f08a0d79377041c3 SOURCES/nagios-agents-metadata-105ab8a.tar.gz
-cd04ce3689e250b2b0d4ce2406222a0cd9767fea SOURCES/pacemaker-2b07d5c.tar.gz
+572f66e455beeb43106974ed547118a26834d099 SOURCES/pacemaker-c3c624e.tar.gz
diff --git a/SOURCES/001-new-behavior.patch b/SOURCES/001-new-behavior.patch
deleted file mode 100644
index c09405b..0000000
--- a/SOURCES/001-new-behavior.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From d0278eca6f2f8d4e707f73d12b4f8161f07e42fe Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 2 Nov 2017 18:26:03 -0500
-Subject: [PATCH 1/2] Feature: tools: enable new crm_resource
- --cleanup/--refresh behavior
-
-it was temporarily disabled by 3576364
----
- tools/crm_resource.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/tools/crm_resource.c b/tools/crm_resource.c
-index 92255df..356bb05 100644
---- a/tools/crm_resource.c
-+++ b/tools/crm_resource.c
-@@ -212,14 +212,11 @@ static struct crm_option long_options[] = {
- },
- {
- "cleanup", no_argument, NULL, 'C',
--#if 0
-- // new behavior disabled until 2.0.0
- "\t\tDelete failed operations from a resource's history allowing its current state to be rechecked.\n"
- "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
- },
- {
- "refresh", no_argument, NULL, 'R',
--#endif
- "\t\tDelete resource's history (including failures) so its current state is rechecked.\n"
- "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
- "\t\t\t\tUnless --force is specified, resource's group or clone (if any) will also be cleaned"
-@@ -384,7 +381,6 @@ static struct crm_option long_options[] = {
- {"un-migrate", no_argument, NULL, 'U', NULL, pcmk_option_hidden},
- {"un-move", no_argument, NULL, 'U', NULL, pcmk_option_hidden},
-
-- {"refresh", 0, 0, 'R', NULL, pcmk_option_hidden}, // remove this line for 2.0.0
- {"reprobe", no_argument, NULL, 'P', NULL, pcmk_option_hidden},
-
- {"-spacer-", 1, NULL, '-', "\nExamples:", pcmk_option_paragraph},
-@@ -645,7 +641,7 @@ main(int argc, char **argv)
- if (cib_file == NULL) {
- require_crmd = TRUE;
- }
-- just_errors = FALSE; // disable until 2.0.0
-+ just_errors = TRUE;
- rsc_cmd = 'C';
- find_flags = pe_find_renamed|pe_find_anon;
- break;
---
-1.8.3.1
-
-
-From b48ceeb041cee65a9b93b9b76235e475fa1a128f Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Mon, 16 Oct 2017 09:45:18 -0500
-Subject: [PATCH 2/2] Feature: crmd: default record-pending to TRUE
-
----
- crmd/lrm.c | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/crmd/lrm.c b/crmd/lrm.c
-index eb4e16e..36dc076 100644
---- a/crmd/lrm.c
-+++ b/crmd/lrm.c
-@@ -2061,25 +2061,22 @@ stop_recurring_actions(gpointer key, gpointer value, gpointer user_data)
- static void
- record_pending_op(const char *node_name, lrmd_rsc_info_t *rsc, lrmd_event_data_t *op)
- {
-+ const char *record_pending = NULL;
-+
- CRM_CHECK(node_name != NULL, return);
- CRM_CHECK(rsc != NULL, return);
- CRM_CHECK(op != NULL, return);
-
-- if (op->op_type == NULL
-+ if ((op->op_type == NULL) || (op->params == NULL)
- || safe_str_eq(op->op_type, CRMD_ACTION_CANCEL)
- || safe_str_eq(op->op_type, CRMD_ACTION_DELETE)) {
- return;
- }
-
-- if (op->params == NULL) {
-+ // defaults to true
-+ record_pending = crm_meta_value(op->params, XML_OP_ATTR_PENDING);
-+ if (record_pending && !crm_is_true(record_pending)) {
- return;
--
-- } else {
-- const char *record_pending = crm_meta_value(op->params, XML_OP_ATTR_PENDING);
--
-- if (record_pending == NULL || crm_is_true(record_pending) == FALSE) {
-- return;
-- }
- }
-
- op->call_id = -1;
---
-1.8.3.1
-
diff --git a/SOURCES/001-rollup.patch b/SOURCES/001-rollup.patch
new file mode 100644
index 0000000..d4f3cf9
--- /dev/null
+++ b/SOURCES/001-rollup.patch
@@ -0,0 +1,355 @@
+From 28076181217313c7e33bf88cb70eb16c2f8e737f Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Thu, 19 Jul 2018 12:38:08 -0500
+Subject: [PATCH 1/4] Low: tools: enable file consolidation in crm_report
+
+Correct a variable misspelling that resulted in file de-duplication being
+skipped. Also, remove an unused variable, and avoid the unreliable "-a".
+Found by static analysis.
+---
+ tools/crm_report.in | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/tools/crm_report.in b/tools/crm_report.in
+index 43ed646..695c1f1 100755
+--- a/tools/crm_report.in
++++ b/tools/crm_report.in
+@@ -27,7 +27,6 @@ eval set -- "$TEMP"
+
+ progname=$(basename "$0")
+ rsh="ssh -T"
+-times=""
+ tests=""
+ nodes=""
+ compress=1
+@@ -243,10 +242,18 @@ EOF
+ # check if files have same content in the cluster
+ #
+ cibdiff() {
+- d1=`dirname $1`
+- d2=`dirname $2`
+- if [ -f $d1/RUNNING -a -f $d2/RUNNING ] ||
+- [ -f $d1/STOPPED -a -f $d2/STOPPED ]; then
++ d1=$(dirname $1)
++ d2=$(dirname $2)
++
++ if [ -f "$d1/RUNNING" ] && [ ! -f "$d2/RUNNING" ]; then
++ DIFF_OK=0
++ elif [ -f "$d1/STOPPED" ] && [ ! -f "$d2/STOPPED" ]; then
++ DIFF_OK=0
++ else
++ DIFF_OK=1
++ fi
++
++ if [ $DIFF_OK -eq 1 ]; then
+ if which crm_diff > /dev/null 2>&1; then
+ crm_diff -c -n $1 -o $2
+ else
+@@ -277,7 +284,7 @@ esac
+ # remove duplicates if files are same, make links instead
+ #
+ consolidate() {
+- for n in $NODES; do
++ for n in $nodes; do
+ if [ -f $1/$2 ]; then
+ rm $1/$n/$2
+ else
+@@ -290,7 +297,7 @@ consolidate() {
+ analyze_one() {
+ rc=0
+ node0=""
+- for n in $NODES; do
++ for n in $nodes; do
+ if [ "$node0" ]; then
+ diffcheck $1/$node0/$2 $1/$n/$2
+ rc=$(($rc+$?))
+--
+1.8.3.1
+
+
+From 2db3895359beb0f577c142c03ac2c8e6f44c67cf Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Wed, 4 Apr 2018 15:47:18 -0500
+Subject: [PATCH 2/4] Low: tools: get sensor lun in ipmiservicelogd before
+ using it
+
+---
+ tools/ipmiservicelogd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/ipmiservicelogd.c b/tools/ipmiservicelogd.c
+index 47ff220..1047c9c 100644
+--- a/tools/ipmiservicelogd.c
++++ b/tools/ipmiservicelogd.c
+@@ -434,14 +434,14 @@ sensor_discrete_event_handler(ipmi_sensor_t * sensor,
+ instance = ipmi_entity_get_entity_instance(ent);
+ ipmi_sensor_get_id(sensor, name, sizeof(name));
+
++ ipmi_sensor_get_num(sensor, &sensor_lun, &sensor_number);
++
+ sel_id = ipmi_entity_get_entity_id(ent);
+ sel_type = ipmi_entity_get_type(ent);
+ generator = ipmi_entity_get_slave_address(ent) | (sensor_lun << 5); /* LUN (2 bits) | SLAVE ADDRESS (5 bits) */
+ version = 0x04;
+ sensor_type = ipmi_sensor_get_sensor_type(sensor);
+
+- ipmi_sensor_get_num(sensor, &sensor_lun, &sensor_number);
+-
+ event_class = 0; /* @TBD - where does this come from? */
+ event_type = ipmi_event_get_type(event);
+ direction = dir;
+--
+1.8.3.1
+
+
+From 7a79e4ef8315842d4d1078475dab287d8f3327de Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Wed, 25 Jul 2018 15:15:38 -0500
+Subject: [PATCH 3/4] Low: tools: notifyServicelogEvent FTBFS on ppc64le
+
+---
+ tools/notifyServicelogEvent.c | 24 ++++++++----------------
+ 1 file changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/tools/notifyServicelogEvent.c b/tools/notifyServicelogEvent.c
+index b7f672c..700f068 100644
+--- a/tools/notifyServicelogEvent.c
++++ b/tools/notifyServicelogEvent.c
+@@ -1,24 +1,15 @@
+ /*
+- * Copyright (C) 2009 International Business Machines, IBM, Mark Hamzy
++ * Copyright 2009-2018 International Business Machines, IBM, Mark Hamzy
+ *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This software is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ * This source code is licensed under the GNU General Public License version 2
++ * or later (GPLv2+) WITHOUT ANY WARRANTY.
+ */
+
+ /* gcc -o notifyServicelogEvent `pkg-config --cflags servicelog-1` `pkg-config --libs servicelog-1` notifyServicelogEvent.c
+ */
+
++#include <crm_internal.h>
++
+ #include <string.h>
+ #include <stdio.h>
+ #include <time.h>
+@@ -27,9 +18,10 @@
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <config.h>
++
+ #include <crm/common/xml.h>
+ #include <crm/common/util.h>
+-#include <crm_internal.h>
++#include <crm/attrd.h>
+
+ typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS;
+
+@@ -91,7 +83,7 @@ main(int argc, char *argv[])
+ struct sl_event *event = NULL;
+ uint64_t event_id = 0;
+
+- crm_log_init_quiet("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv);
++ crm_log_cli_init("notifyServicelogEvent");
+ crm_set_options(NULL, "event_id ", long_options,
+ "Gets called upon events written to servicelog database");
+
+--
+1.8.3.1
+
+
+From b408a3ead462c8f02b68a164f24ba1b05bb3cad1 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Wed, 25 Jul 2018 16:07:42 -0500
+Subject: [PATCH 4/4] Low: tools: ipmiservicelogd FTBFS on ppc64le
+
+---
+ tools/ipmiservicelogd.c | 53 +++++++++++++++++++++++--------------------------
+ 1 file changed, 25 insertions(+), 28 deletions(-)
+
+diff --git a/tools/ipmiservicelogd.c b/tools/ipmiservicelogd.c
+index 1047c9c..4f52865 100644
+--- a/tools/ipmiservicelogd.c
++++ b/tools/ipmiservicelogd.c
+@@ -9,13 +9,10 @@
+ * Author: Intel Corporation
+ * Jeff Zheng <Jeff.Zheng@Intel.com>
+ *
+- * Copyright 2009 International Business Machines, IBM
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public License
+- * as published by the Free Software Foundation; either version 2 of
+- * the License, or (at your option) any later version.
++ * Copyright 2009-2018 International Business Machines, IBM
+ *
++ * This source code is licensed under the GNU Lesser General Public License
++ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+@@ -27,10 +24,6 @@
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this program; if not, write to the Free
+- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+ /* gcc -o ipmiservicelogd -g `pkg-config --cflags --libs OpenIPMI OpenIPMIposix servicelog-1` ipmiservicelogd.c
+@@ -38,6 +31,12 @@
+ /* ./ipmiservicelogd smi 0
+ */
+
++#include <crm_internal.h>
++
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -68,7 +67,7 @@
+
+ static os_handler_t *os_hnd;
+
+-char *getStringExecOutput(char *args[]);
++char *getStringExecOutput(const char *const args[]);
+ char *getSerialNumber(void);
+ char *getProductName(void);
+ static void con_usage(const char *name, const char *help, void *cb_data);
+@@ -91,7 +90,7 @@ void setup_done(ipmi_domain_t * domain, int err, unsigned int conn_num, unsigned
+ int still_connected, void *user_data);
+
+ char *
+-getStringExecOutput(char *args[])
++getStringExecOutput(const char *const args[])
+ {
+ int rc;
+ pid_t pid;
+@@ -201,7 +200,11 @@ getStringExecOutput(char *args[])
+ crm_err("Error: child close (pipefd[1]) = %d", errno);
+ }
+
+- rc = execvp(args[0], args);
++ /* execvp() takes (char *const *) for backward compatibility,
++ * but POSIX guarantees that it will not modify the strings,
++ * so the cast is safe
++ */
++ rc = execvp(args[0], (char *const *) args);
+
+ if (rc == -1) {
+ crm_err("Error: child execvp = %d", errno);
+@@ -224,7 +227,7 @@ getStringExecOutput(char *args[])
+ char *
+ getSerialNumber(void)
+ {
+- char *dmiArgs[] = {
++ const char *const dmiArgs[] = {
+ "dmidecode",
+ "--string",
+ "system-serial-number",
+@@ -237,7 +240,7 @@ getSerialNumber(void)
+ char *
+ getProductName(void)
+ {
+- char *dmiArgs[] = {
++ const char *dmiArgs[] = {
+ "dmidecode",
+ "--string",
+ "system-product-name",
+@@ -313,8 +316,8 @@ ipmi2servicelog(struct sl_data_bmc *bmc_data)
+ sl_event.machine_serial = serial_number;
+ sl_event.machine_model = product_name; /* it may not have the serial # within the first 20 chars */
+ sl_event.nodename = name.nodename;
+- sl_event.refcode = "ipmi";
+- sl_event.description = "ipmi event";
++ sl_event.refcode = strdup("ipmi");
++ sl_event.description = strdup("ipmi event");
+ sl_event.serviceable = 1; /* 1 or 0 */
+ sl_event.predictive = 0; /* 1 or 0 */
+ sl_event.disposition = SL_DISP_RECOVERABLE; /* one of SL_DISP_* */
+@@ -336,6 +339,8 @@ ipmi2servicelog(struct sl_data_bmc *bmc_data)
+ crm_debug("Sending to servicelog database");
+ }
+
++ free(sl_event.refcode);
++ free(sl_event.description);
+ free(serial_number);
+ free(product_name);
+
+@@ -352,7 +357,6 @@ sensor_threshold_event_handler(ipmi_sensor_t * sensor,
+ double value, void *cb_data, ipmi_event_t * event)
+ {
+ ipmi_entity_t *ent = ipmi_sensor_get_entity(sensor);
+- int id, instance;
+ char name[IPMI_ENTITY_NAME_LEN];
+ struct sl_data_bmc bmc_data;
+ uint32_t sel_id;
+@@ -366,8 +370,6 @@ sensor_threshold_event_handler(ipmi_sensor_t * sensor,
+ uint8_t event_type;
+ int direction;
+
+- id = ipmi_entity_get_entity_id(ent);
+- instance = ipmi_entity_get_entity_instance(ent);
+ ipmi_sensor_get_id(sensor, name, sizeof(name));
+
+ ipmi_sensor_get_num(sensor, &sensor_lun, &sensor_number);
+@@ -416,7 +418,6 @@ sensor_discrete_event_handler(ipmi_sensor_t * sensor,
+ int severity, int prev_severity, void *cb_data, ipmi_event_t * event)
+ {
+ ipmi_entity_t *ent = ipmi_sensor_get_entity(sensor);
+- int id, instance;
+ char name[IPMI_ENTITY_NAME_LEN];
+ struct sl_data_bmc bmc_data;
+ uint32_t sel_id;
+@@ -430,8 +431,6 @@ sensor_discrete_event_handler(ipmi_sensor_t * sensor,
+ uint8_t event_type;
+ int direction;
+
+- id = ipmi_entity_get_entity_id(ent);
+- instance = ipmi_entity_get_entity_instance(ent);
+ ipmi_sensor_get_id(sensor, name, sizeof(name));
+
+ ipmi_sensor_get_num(sensor, &sensor_lun, &sensor_number);
+@@ -501,10 +500,7 @@ static void
+ entity_change(enum ipmi_update_e op, ipmi_domain_t * domain, ipmi_entity_t * entity, void *cb_data)
+ {
+ int rv;
+- int id, instance;
+
+- id = ipmi_entity_get_entity_id(entity);
+- instance = ipmi_entity_get_entity_instance(entity);
+ if (op == IPMI_ADDED) {
+ /* Register callback so that when the status of a
+ sensor changes, sensor_change is called */
+@@ -564,8 +560,9 @@ main(int argc, char *argv[])
+ #endif
+
+ crm_make_daemon("ipmiservicelogd", TRUE, "/var/run/ipmiservicelogd.pid0");
+-
+- crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv);
++ crm_log_cli_init("ipmiservicelogd");
++ // Maybe this should log like a daemon instead?
++ // crm_log_init("ipmiservicelogd", LOG_INFO, TRUE, FALSE, argc, argv, FALSE);
+
+ #ifdef COMPLEX
+ rv = ipmi_args_setup_con(args, os_hnd, NULL, &con);
+--
+1.8.3.1
+
diff --git a/SOURCES/002-fixes.patch b/SOURCES/002-fixes.patch
deleted file mode 100644
index 02d563d..0000000
--- a/SOURCES/002-fixes.patch
+++ /dev/null
@@ -1,7624 +0,0 @@
-From 87856f05a85e2d20b7265b78373657e97dbf18e4 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Wed, 29 Nov 2017 17:21:29 -0600
-Subject: [PATCH 01/16] Fix: attrd: ensure node name is broadcast at start-up
- (CLBZ#5330)
-
-This fixes a regression introduced in 1.1.18.
-
-Since c9d1c3cd, the crmd no longer explicitly clears the terminate and shutdown
-node attributes at first join. An unwanted side effect of this was that the
-attrd writer no longer reliably learned a joining node's name. If a node is
-known only by its ID, the writer can not write its attributes to the CIB.
-
-The worst outcome is that the joining node would be unable to shut down,
-since the shutdown attribute would never trigger the policy engine. The window
-was limited because the writer learns the node's name if a new attrd
-election was required, or a node attribute was set locally on the joining node.
-
-The fix is to set a new private attribute, #attrd-protocol, at attrd start-up,
-with the supported attrd protocol version. This has the additional benefit of
-allowing any node to determine the minimum supported protocol version across
-all active cluster nodes.
----
- attrd/commands.c | 30 ++++++++++++++++++++++++------
- attrd/internal.h | 1 +
- attrd/main.c | 7 +++++++
- include/crm/crm.h | 1 +
- 4 files changed, 33 insertions(+), 6 deletions(-)
-
-diff --git a/attrd/commands.c b/attrd/commands.c
-index 967703f..0a20b26 100644
---- a/attrd/commands.c
-+++ b/attrd/commands.c
-@@ -35,8 +35,9 @@
- * heartbeat, CMAN, or corosync-plugin stacks) is unversioned.
- *
- * With atomic attrd, each attrd will send ATTRD_PROTOCOL_VERSION with every
-- * peer request and reply. Currently, there is no way to know the minimum
-- * version supported by all peers, which limits its usefulness.
-+ * peer request and reply. As of Pacemaker 2.0.0, at start-up each attrd will
-+ * also set a private attribute for itself with its version, so any attrd can
-+ * determine the minimum version supported by all peers.
- *
- * Protocol Pacemaker Significant changes
- * -------- --------- -------------------
-@@ -289,11 +290,10 @@ void
- attrd_client_clear_failure(xmlNode *xml)
- {
- #if 0
-- /* @TODO This would be most efficient, but there is currently no way to
-- * verify that all peers support the op. If that ever changes, we could
-- * enable this code.
-+ /* @TODO Track the minimum supported protocol version across all nodes,
-+ * then enable this more-efficient code.
- */
-- if (all_peers_support_clear_failure) {
-+ if (compare_version("2", minimum_protocol_version) <= 0) {
- /* Propagate to all peers (including ourselves).
- * This ends up at attrd_peer_message().
- */
-@@ -523,6 +523,24 @@ attrd_peer_clear_failure(crm_node_t *peer, xmlNode *xml)
- regfree(®ex);
- }
-
-+/*!
-+ \internal
-+ \brief Broadcast private attribute for local node with protocol version
-+*/
-+void
-+attrd_broadcast_protocol()
-+{
-+ xmlNode *attrd_op = create_xml_node(NULL, __FUNCTION__);
-+
-+ crm_xml_add(attrd_op, F_TYPE, T_ATTRD);
-+ crm_xml_add(attrd_op, F_ORIG, crm_system_name);
-+ crm_xml_add(attrd_op, F_ATTRD_TASK, ATTRD_OP_UPDATE);
-+ crm_xml_add(attrd_op, F_ATTRD_ATTRIBUTE, CRM_ATTR_PROTOCOL);
-+ crm_xml_add(attrd_op, F_ATTRD_VALUE, ATTRD_PROTOCOL_VERSION);
-+ crm_xml_add_int(attrd_op, F_ATTRD_IS_PRIVATE, 1);
-+ attrd_client_update(attrd_op);
-+}
-+
- void
- attrd_peer_message(crm_node_t *peer, xmlNode *xml)
- {
-diff --git a/attrd/internal.h b/attrd/internal.h
-index 99fc3fd..23bcbda 100644
---- a/attrd/internal.h
-+++ b/attrd/internal.h
-@@ -53,6 +53,7 @@ election_t *writer;
- crm_ipcs_send_ack((client), (id), (flags), "ack", __FUNCTION__, __LINE__)
-
- void write_attributes(bool all);
-+void attrd_broadcast_protocol(void);
- void attrd_peer_message(crm_node_t *client, xmlNode *msg);
- void attrd_client_peer_remove(const char *client_name, xmlNode *xml);
- void attrd_client_clear_failure(xmlNode *xml);
-diff --git a/attrd/main.c b/attrd/main.c
-index 2670dc5..7721439 100644
---- a/attrd/main.c
-+++ b/attrd/main.c
-@@ -220,6 +220,13 @@ attrd_cib_connect(int max_retry)
- // Always read the CIB at start-up
- mainloop_set_trigger(attrd_config_read);
-
-+ /* Set a private attribute for ourselves with the protocol version we
-+ * support. This lets all nodes determine the minimum supported version
-+ * across all nodes. It also ensures that the writer learns our node name,
-+ * so it can send our attributes to the CIB.
-+ */
-+ attrd_broadcast_protocol();
-+
- return pcmk_ok;
-
- cleanup:
-diff --git a/include/crm/crm.h b/include/crm/crm.h
-index 05ec555..6e2bcfa 100644
---- a/include/crm/crm.h
-+++ b/include/crm/crm.h
-@@ -106,6 +106,7 @@ extern char *crm_system_name;
- # define CRM_ATTR_DIGESTS_ALL "#digests-all"
- # define CRM_ATTR_DIGESTS_SECURE "#digests-secure"
- # define CRM_ATTR_RA_VERSION "#ra-version"
-+# define CRM_ATTR_PROTOCOL "#attrd-protocol"
-
- /* Valid operations */
- # define CRM_OP_NOOP "noop"
---
-1.8.3.1
-
-
-From a87421042f5030e6dd7823cd80d7632b91296519 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 1 Dec 2017 11:02:54 -0600
-Subject: [PATCH 02/16] Refactor: pengine: functionize checking whether node
- was unfenced
-
-reduces code duplication and enhances readability
----
- pengine/native.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/pengine/native.c b/pengine/native.c
-index e72dec4..c998e4b 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -429,6 +429,14 @@ rsc_merge_weights(resource_t * rsc, const char *rhs, GHashTable * nodes, const c
- return work;
- }
-
-+static inline bool
-+node_has_been_unfenced(node_t *node)
-+{
-+ const char *unfenced = pe_node_attribute_raw(node, CRM_ATTR_UNFENCED);
-+
-+ return unfenced && strcmp("0", unfenced);
-+}
-+
- node_t *
- native_color(resource_t * rsc, node_t * prefer, pe_working_set_t * data_set)
- {
-@@ -2524,10 +2532,9 @@ StopRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t * d
-
- if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
- action_t *unfence = pe_fence_op(current, "on", TRUE, NULL, data_set);
-- const char *unfenced = pe_node_attribute_raw(current, CRM_ATTR_UNFENCED);
-
- order_actions(stop, unfence, pe_order_implies_first);
-- if (unfenced == NULL || safe_str_eq("0", unfenced)) {
-+ if (!node_has_been_unfenced(current)) {
- pe_proc_err("Stopping %s until %s can be unfenced", rsc->id, current->details->uname);
- }
- }
-@@ -2547,11 +2554,9 @@ StartRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t *
-
- if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
- action_t *unfence = pe_fence_op(next, "on", TRUE, NULL, data_set);
-- const char *unfenced = pe_node_attribute_raw(next, CRM_ATTR_UNFENCED);
-
- order_actions(unfence, start, pe_order_implies_then);
--
-- if (unfenced == NULL || safe_str_eq("0", unfenced)) {
-+ if (!node_has_been_unfenced(next)) {
- char *reason = crm_strdup_printf("Required by %s", rsc->id);
- trigger_unfencing(NULL, next, reason, NULL, data_set);
- free(reason);
---
-1.8.3.1
-
-
-From b6b3fb9e8c6c6b34fb39c9d7f0b89ef41e9486fa Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 1 Dec 2017 11:45:31 -0600
-Subject: [PATCH 03/16] Refactor: pengine: functionize checking for unfence
- device
-
-Reduces code duplication and enhances readability. This also comments out some
-dead code from when probe_complete was still used.
----
- pengine/native.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/pengine/native.c b/pengine/native.c
-index c998e4b..e57fbc7 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -437,6 +437,13 @@ node_has_been_unfenced(node_t *node)
- return unfenced && strcmp("0", unfenced);
- }
-
-+static inline bool
-+is_unfence_device(resource_t *rsc, pe_working_set_t *data_set)
-+{
-+ return is_set(rsc->flags, pe_rsc_fence_device)
-+ && is_set(data_set->flags, pe_flag_enable_unfencing);
-+}
-+
- node_t *
- native_color(resource_t * rsc, node_t * prefer, pe_working_set_t * data_set)
- {
-@@ -3015,12 +3022,8 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
- crm_debug("Probing %s on %s (%s) %d %p", rsc->id, node->details->uname, role2text(rsc->role),
- is_set(probe->flags, pe_action_runnable), rsc->running_on);
-
-- if(is_set(rsc->flags, pe_rsc_fence_device) && is_set(data_set->flags, pe_flag_enable_unfencing)) {
-+ if (is_unfence_device(rsc, data_set) || !pe_rsc_is_clone(top)) {
- top = rsc;
--
-- } else if (pe_rsc_is_clone(top) == FALSE) {
-- top = rsc;
--
- } else {
- crm_trace("Probing %s on %s (%s) as %s", rsc->id, node->details->uname, role2text(rsc->role), top->id);
- }
-@@ -3041,17 +3044,18 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
- top, reload_key(rsc), NULL,
- pe_order_optional, data_set);
-
-- if(is_set(rsc->flags, pe_rsc_fence_device) && is_set(data_set->flags, pe_flag_enable_unfencing)) {
-+#if 0
-+ // complete is always null currently
-+ if (!is_unfence_device(rsc, data_set)) {
- /* Normally rsc.start depends on probe complete which depends
-- * on rsc.probe. But this can't be the case in this scenario as
-- * it would create graph loops.
-+ * on rsc.probe. But this can't be the case for fence devices
-+ * with unfencing, as it would create graph loops.
- *
- * So instead we explicitly order 'rsc.probe then rsc.start'
- */
--
-- } else {
- order_actions(probe, complete, pe_order_implies_then);
- }
-+#endif
- return TRUE;
- }
-
---
-1.8.3.1
-
-
-From 63431baae2e544dc3b21d51b035942dfeeca5561 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 1 Dec 2017 12:06:16 -0600
-Subject: [PATCH 04/16] Fix: pengine: unfence before probing or starting fence
- devices
-
-Regression since 7f8ba307
----
- pengine/native.c | 62 ++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 35 insertions(+), 27 deletions(-)
-
-diff --git a/pengine/native.c b/pengine/native.c
-index e57fbc7..0013e33 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -2550,6 +2550,39 @@ StopRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t * d
- return TRUE;
- }
-
-+static void
-+order_after_unfencing(resource_t *rsc, pe_node_t *node, action_t *action,
-+ enum pe_ordering order, pe_working_set_t *data_set)
-+{
-+ /* When unfencing is in use, we order unfence actions before any probe or
-+ * start of resources that require unfencing, and also of fence devices.
-+ *
-+ * This might seem to violate the principle that fence devices require
-+ * only quorum. However, fence agents that unfence often don't have enough
-+ * information to even probe or start unless the node is first unfenced.
-+ */
-+ if (is_unfence_device(rsc, data_set)
-+ || is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-+
-+ /* Start with an optional ordering. Requiring unfencing would result in
-+ * the node being unfenced, and all its resources being stopped,
-+ * whenever a new resource is added -- which would be highly suboptimal.
-+ */
-+ action_t *unfence = pe_fence_op(node, "on", TRUE, NULL, data_set);
-+
-+ order_actions(unfence, action, order);
-+
-+ if (!node_has_been_unfenced(node)) {
-+ // But unfencing is required if it has never been done
-+ char *reason = crm_strdup_printf("required by %s %s",
-+ rsc->id, action->task);
-+
-+ trigger_unfencing(NULL, node, reason, NULL, data_set);
-+ free(reason);
-+ }
-+ }
-+}
-+
- gboolean
- StartRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t * data_set)
- {
-@@ -2559,16 +2592,7 @@ StartRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t *
- pe_rsc_trace(rsc, "%s on %s %d %d", rsc->id, next ? next->details->uname : "N/A", optional, next ? next->weight : 0);
- start = start_action(rsc, next, TRUE);
-
-- if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-- action_t *unfence = pe_fence_op(next, "on", TRUE, NULL, data_set);
--
-- order_actions(unfence, start, pe_order_implies_then);
-- if (!node_has_been_unfenced(next)) {
-- char *reason = crm_strdup_printf("Required by %s", rsc->id);
-- trigger_unfencing(NULL, next, reason, NULL, data_set);
-- free(reason);
-- }
-- }
-+ order_after_unfencing(rsc, next, start, pe_order_implies_then, data_set);
-
- if (is_set(start->flags, pe_action_runnable) && optional == FALSE) {
- update_action_flags(start, pe_action_optional | pe_action_clear, __FUNCTION__, __LINE__);
-@@ -2989,23 +3013,7 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
- probe = custom_action(rsc, key, RSC_STATUS, node, FALSE, TRUE, data_set);
- update_action_flags(probe, pe_action_optional | pe_action_clear, __FUNCTION__, __LINE__);
-
-- /* If enabled, require unfencing before probing any fence devices
-- * but ensure it happens after any resources that require
-- * unfencing have been probed.
-- *
-- * Doing it the other way (requiring unfencing after probing
-- * resources that need it) would result in the node being
-- * unfenced, and all its resources being stopped, whenever a new
-- * resource is added. Which would be highly suboptimal.
-- *
-- * So essentially, at the point the fencing device(s) have been
-- * probed, we know the state of all resources that require
-- * unfencing and that unfencing occurred.
-- */
-- if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-- action_t *unfence = pe_fence_op(node, "on", TRUE, NULL, data_set);
-- order_actions(unfence, probe, pe_order_optional);
-- }
-+ order_after_unfencing(rsc, node, probe, pe_order_optional, data_set);
-
- /*
- * We need to know if it's running_on (not just known_on) this node
---
-1.8.3.1
-
-
-From 9d3840f374122f6258ddfe44bf85ff43d394d209 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 1 Dec 2017 12:24:55 -0600
-Subject: [PATCH 05/16] Test: PE: update regression tests for unfencing change
-
----
- pengine/test10/start-then-stop-with-unfence.dot | 3 +++
- pengine/test10/start-then-stop-with-unfence.exp | 15 +++++++++++++--
- pengine/test10/start-then-stop-with-unfence.summary | 10 +++++-----
- pengine/test10/unfence-definition.dot | 2 ++
- pengine/test10/unfence-definition.exp | 9 ++++++++-
- pengine/test10/unfence-definition.summary | 4 ++--
- pengine/test10/unfence-parameters.dot | 2 ++
- pengine/test10/unfence-parameters.exp | 9 ++++++++-
- pengine/test10/unfence-parameters.summary | 4 ++--
- pengine/test10/unfence-startup.dot | 1 +
- pengine/test10/unfence-startup.exp | 6 +++++-
- pengine/test10/unfence-startup.summary | 4 ++--
- 12 files changed, 53 insertions(+), 16 deletions(-)
-
-diff --git a/pengine/test10/start-then-stop-with-unfence.dot b/pengine/test10/start-then-stop-with-unfence.dot
-index 6e9569b..b324339 100644
---- a/pengine/test10/start-then-stop-with-unfence.dot
-+++ b/pengine/test10/start-then-stop-with-unfence.dot
-@@ -23,5 +23,8 @@ digraph "g" {
- "mpath-node2_monitor_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"]
- "stonith 'on' rhel7-node1.example.com" -> "ip1_start_0 rhel7-node1.example.com" [ style = bold]
- "stonith 'on' rhel7-node1.example.com" -> "jrummy_start_0 rhel7-node1.example.com" [ style = bold]
-+"stonith 'on' rhel7-node1.example.com" -> "mpath-node1_monitor_0 rhel7-node1.example.com" [ style = bold]
-+"stonith 'on' rhel7-node1.example.com" -> "mpath-node1_start_0 rhel7-node1.example.com" [ style = bold]
-+"stonith 'on' rhel7-node1.example.com" -> "mpath-node2_monitor_0 rhel7-node1.example.com" [ style = bold]
- "stonith 'on' rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"]
- }
-diff --git a/pengine/test10/start-then-stop-with-unfence.exp b/pengine/test10/start-then-stop-with-unfence.exp
-index 75cb356..715ba40 100644
---- a/pengine/test10/start-then-stop-with-unfence.exp
-+++ b/pengine/test10/start-then-stop-with-unfence.exp
-@@ -6,7 +6,11 @@
- <attributes CRM_meta_on_node="rhel7-node1.example.com" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" devices="/dev/mapper/clustPVa" key="1234" pcmk_host_list="rhel7-node2.example.com"/>
- </rsc_op>
- </action_set>
-- <inputs/>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="6" operation="stonith" operation_key="stonith-rhel7-node1.example.com-on" on_node="rhel7-node1.example.com" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
- </synapse>
- <synapse id="1">
- <action_set>
-@@ -30,6 +34,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <crm_event id="6" operation="stonith" operation_key="stonith-rhel7-node1.example.com-on" on_node="rhel7-node1.example.com" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="9" operation="monitor" operation_key="mpath-node1_monitor_0" on_node="rhel7-node1.example.com" on_node_uuid="1"/>
- </trigger>
- </inputs>
-@@ -41,7 +48,11 @@
- <attributes CRM_meta_on_node="rhel7-node1.example.com" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" devices="/dev/mapper/clustPVa" key="1233" pcmk_host_list="rhel7-node1.example.com"/>
- </rsc_op>
- </action_set>
-- <inputs/>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="6" operation="stonith" operation_key="stonith-rhel7-node1.example.com-on" on_node="rhel7-node1.example.com" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
- </synapse>
- <synapse id="4">
- <action_set>
-diff --git a/pengine/test10/start-then-stop-with-unfence.summary b/pengine/test10/start-then-stop-with-unfence.summary
-index 2e02a21..b2114d7 100644
---- a/pengine/test10/start-then-stop-with-unfence.summary
-+++ b/pengine/test10/start-then-stop-with-unfence.summary
-@@ -11,23 +11,23 @@ Online: [ rhel7-node1.example.com rhel7-node2.example.com ]
- Stopped: [ rhel7-node1.example.com ]
-
- Transition Summary:
-- * Fence (on) rhel7-node1.example.com 'Required by ip1'
-+ * Fence (on) rhel7-node1.example.com 'required by mpath-node2 monitor'
- * Start mpath-node1 (rhel7-node1.example.com)
- * Move ip1 ( rhel7-node2.example.com -> rhel7-node1.example.com )
- * Start jrummy:1 (rhel7-node1.example.com)
-
- Executing cluster transition:
-- * Resource action: mpath-node2 monitor on rhel7-node1.example.com
-- * Resource action: mpath-node1 monitor on rhel7-node1.example.com
- * Pseudo action: jrummy-clone_start_0
- * Fencing rhel7-node1.example.com (on)
-- * Resource action: mpath-node1 start on rhel7-node1.example.com
-+ * Resource action: mpath-node2 monitor on rhel7-node1.example.com
-+ * Resource action: mpath-node1 monitor on rhel7-node1.example.com
- * Resource action: jrummy start on rhel7-node1.example.com
- * Pseudo action: jrummy-clone_running_0
-- * Resource action: mpath-node1 monitor=60000 on rhel7-node1.example.com
-+ * Resource action: mpath-node1 start on rhel7-node1.example.com
- * Resource action: ip1 stop on rhel7-node2.example.com
- * Resource action: jrummy monitor=10000 on rhel7-node1.example.com
- * Pseudo action: all_stopped
-+ * Resource action: mpath-node1 monitor=60000 on rhel7-node1.example.com
- * Resource action: ip1 start on rhel7-node1.example.com
- * Resource action: ip1 monitor=10000 on rhel7-node1.example.com
-
-diff --git a/pengine/test10/unfence-definition.dot b/pengine/test10/unfence-definition.dot
-index 3bc29d3..c42391a 100644
---- a/pengine/test10/unfence-definition.dot
-+++ b/pengine/test10/unfence-definition.dot
-@@ -66,11 +66,13 @@ digraph "g" {
- "fencing_stop_0 virt-1" [ style=bold color="green" fontcolor="black"]
- "stonith 'on' virt-1" -> "clvmd_start_0 virt-1" [ style = bold]
- "stonith 'on' virt-1" -> "dlm_start_0 virt-1" [ style = bold]
-+"stonith 'on' virt-1" -> "fencing_start_0 virt-1" [ style = bold]
- "stonith 'on' virt-1" [ style=bold color="green" fontcolor="black"]
- "stonith 'on' virt-3" -> "clvmd:2_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "dlm:2_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold]
-+"stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"]
- "stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold]
- "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"]
-diff --git a/pengine/test10/unfence-definition.exp b/pengine/test10/unfence-definition.exp
-index b1e241a..25c5674 100644
---- a/pengine/test10/unfence-definition.exp
-+++ b/pengine/test10/unfence-definition.exp
-@@ -11,6 +11,9 @@
- <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-+ <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="6" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-@@ -28,7 +31,11 @@
- <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
-- <inputs/>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
-+ </trigger>
-+ </inputs>
- </synapse>
- <synapse id="2">
- <action_set>
-diff --git a/pengine/test10/unfence-definition.summary b/pengine/test10/unfence-definition.summary
-index 4ca9344..2051c51 100644
---- a/pengine/test10/unfence-definition.summary
-+++ b/pengine/test10/unfence-definition.summary
-@@ -13,7 +13,7 @@ Online: [ virt-1 virt-2 virt-3 ]
-
- Transition Summary:
- * Fence (reboot) virt-4 'node is unclean'
-- * Fence (on) virt-3 'Required by dlm:2'
-+ * Fence (on) virt-3 'required by fencing monitor'
- * Fence (on) virt-1 'Device definition changed'
- * Restart fencing ( virt-1 )
- * Restart dlm:0 ( virt-1 ) due to required stonith
-@@ -23,13 +23,13 @@ Transition Summary:
- * Start clvmd:2 (virt-3)
-
- Executing cluster transition:
-- * Resource action: fencing monitor on virt-3
- * Resource action: fencing stop on virt-1
- * Resource action: clvmd monitor on virt-2
- * Pseudo action: clvmd-clone_stop_0
- * Fencing virt-4 (reboot)
- * Pseudo action: stonith_complete
- * Fencing virt-3 (on)
-+ * Resource action: fencing monitor on virt-3
- * Resource action: fencing delete on virt-1
- * Resource action: dlm monitor on virt-3
- * Resource action: clvmd stop on virt-1
-diff --git a/pengine/test10/unfence-parameters.dot b/pengine/test10/unfence-parameters.dot
-index ce006c4..3c27b22 100644
---- a/pengine/test10/unfence-parameters.dot
-+++ b/pengine/test10/unfence-parameters.dot
-@@ -63,11 +63,13 @@ digraph "g" {
- "fencing_stop_0 virt-1" [ style=bold color="green" fontcolor="black"]
- "stonith 'on' virt-1" -> "clvmd_start_0 virt-1" [ style = bold]
- "stonith 'on' virt-1" -> "dlm_start_0 virt-1" [ style = bold]
-+"stonith 'on' virt-1" -> "fencing_start_0 virt-1" [ style = bold]
- "stonith 'on' virt-1" [ style=bold color="green" fontcolor="black"]
- "stonith 'on' virt-3" -> "clvmd:2_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "dlm:2_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold]
-+"stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"]
- "stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold]
- "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"]
-diff --git a/pengine/test10/unfence-parameters.exp b/pengine/test10/unfence-parameters.exp
-index b8053c7..3b73fc7 100644
---- a/pengine/test10/unfence-parameters.exp
-+++ b/pengine/test10/unfence-parameters.exp
-@@ -15,7 +15,11 @@
- <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
-- <inputs/>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
-+ </trigger>
-+ </inputs>
- </synapse>
- <synapse id="2">
- <action_set>
-@@ -29,6 +33,9 @@
- <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-+ <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="8" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/>
- </trigger>
- <trigger>
-diff --git a/pengine/test10/unfence-parameters.summary b/pengine/test10/unfence-parameters.summary
-index 5b582d9..2cc9e27 100644
---- a/pengine/test10/unfence-parameters.summary
-+++ b/pengine/test10/unfence-parameters.summary
-@@ -13,7 +13,7 @@ Online: [ virt-1 virt-2 virt-3 ]
-
- Transition Summary:
- * Fence (reboot) virt-4 'node is unclean'
-- * Fence (on) virt-3 'Required by dlm:2'
-+ * Fence (on) virt-3 'required by fencing monitor'
- * Fence (on) virt-1 'Device parameters changed (reload)'
- * Restart fencing ( virt-1 ) due to resource definition change
- * Restart dlm:0 ( virt-1 ) due to required stonith
-@@ -24,12 +24,12 @@ Transition Summary:
-
- Executing cluster transition:
- * Resource action: fencing stop on virt-1
-- * Resource action: fencing monitor on virt-3
- * Resource action: clvmd monitor on virt-2
- * Pseudo action: clvmd-clone_stop_0
- * Fencing virt-4 (reboot)
- * Pseudo action: stonith_complete
- * Fencing virt-3 (on)
-+ * Resource action: fencing monitor on virt-3
- * Resource action: dlm monitor on virt-3
- * Resource action: clvmd stop on virt-1
- * Resource action: clvmd monitor on virt-3
-diff --git a/pengine/test10/unfence-startup.dot b/pengine/test10/unfence-startup.dot
-index d496956..642f795 100644
---- a/pengine/test10/unfence-startup.dot
-+++ b/pengine/test10/unfence-startup.dot
-@@ -29,6 +29,7 @@ digraph "g" {
- "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "dlm:2_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold]
-+"stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold]
- "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"]
- "stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold]
- "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"]
-diff --git a/pengine/test10/unfence-startup.exp b/pengine/test10/unfence-startup.exp
-index 70c1686..bfd24c8 100644
---- a/pengine/test10/unfence-startup.exp
-+++ b/pengine/test10/unfence-startup.exp
-@@ -6,7 +6,11 @@
- <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
-- <inputs/>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
-+ </trigger>
-+ </inputs>
- </synapse>
- <synapse id="1">
- <action_set>
-diff --git a/pengine/test10/unfence-startup.summary b/pengine/test10/unfence-startup.summary
-index 276358c..4601f31 100644
---- a/pengine/test10/unfence-startup.summary
-+++ b/pengine/test10/unfence-startup.summary
-@@ -13,18 +13,18 @@ Online: [ virt-1 virt-2 virt-3 ]
-
- Transition Summary:
- * Fence (reboot) virt-4 'node is unclean'
-- * Fence (on) virt-3 'Required by dlm:2'
-+ * Fence (on) virt-3 'required by fencing monitor'
- * Start dlm:2 (virt-3)
- * Start clvmd:1 (virt-2)
- * Start clvmd:2 (virt-3)
-
- Executing cluster transition:
-- * Resource action: fencing monitor on virt-3
- * Resource action: clvmd monitor on virt-2
- * Fencing virt-4 (reboot)
- * Pseudo action: stonith_complete
- * Fencing virt-3 (on)
- * Pseudo action: all_stopped
-+ * Resource action: fencing monitor on virt-3
- * Resource action: dlm monitor on virt-3
- * Pseudo action: dlm-clone_start_0
- * Resource action: clvmd monitor on virt-3
---
-1.8.3.1
-
-
-From c11d10ef4f04bbdb2e6b7e6251b88e50faccaaca Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 1 Dec 2017 14:36:03 -0600
-Subject: [PATCH 06/16] Test: PE: add regression test for unfencing with only
- fence devices
-
----
- pengine/regression.sh | 1 +
- pengine/test10/unfence-device.dot | 18 ++++++
- pengine/test10/unfence-device.exp | 100 ++++++++++++++++++++++++++++++++++
- pengine/test10/unfence-device.scores | 5 ++
- pengine/test10/unfence-device.summary | 29 ++++++++++
- pengine/test10/unfence-device.xml | 66 ++++++++++++++++++++++
- 6 files changed, 219 insertions(+)
- create mode 100644 pengine/test10/unfence-device.dot
- create mode 100644 pengine/test10/unfence-device.exp
- create mode 100644 pengine/test10/unfence-device.scores
- create mode 100644 pengine/test10/unfence-device.summary
- create mode 100644 pengine/test10/unfence-device.xml
-
-diff --git a/pengine/regression.sh b/pengine/regression.sh
-index db101e7..47cf0ba 100755
---- a/pengine/regression.sh
-+++ b/pengine/regression.sh
-@@ -393,6 +393,7 @@ echo ""
- do_test unfence-startup "Clean unfencing"
- do_test unfence-definition "Unfencing when the agent changes"
- do_test unfence-parameters "Unfencing when the agent parameters changes"
-+do_test unfence-device "Unfencing when a cluster has only fence devices"
-
- echo ""
- do_test master-0 "Stopped -> Slave"
-diff --git a/pengine/test10/unfence-device.dot b/pengine/test10/unfence-device.dot
-new file mode 100644
-index 0000000..e383fd2
---- /dev/null
-+++ b/pengine/test10/unfence-device.dot
-@@ -0,0 +1,18 @@
-+digraph "g" {
-+"fence_scsi_monitor_0 virt-008" -> "fence_scsi_start_0 virt-008" [ style = bold]
-+"fence_scsi_monitor_0 virt-008" [ style=bold color="green" fontcolor="black"]
-+"fence_scsi_monitor_0 virt-009" -> "fence_scsi_start_0 virt-008" [ style = bold]
-+"fence_scsi_monitor_0 virt-009" [ style=bold color="green" fontcolor="black"]
-+"fence_scsi_monitor_0 virt-013" -> "fence_scsi_start_0 virt-008" [ style = bold]
-+"fence_scsi_monitor_0 virt-013" [ style=bold color="green" fontcolor="black"]
-+"fence_scsi_monitor_60000 virt-008" [ style=bold color="green" fontcolor="black"]
-+"fence_scsi_start_0 virt-008" -> "fence_scsi_monitor_60000 virt-008" [ style = bold]
-+"fence_scsi_start_0 virt-008" [ style=bold color="green" fontcolor="black"]
-+"stonith 'on' virt-008" -> "fence_scsi_monitor_0 virt-008" [ style = bold]
-+"stonith 'on' virt-008" -> "fence_scsi_start_0 virt-008" [ style = bold]
-+"stonith 'on' virt-008" [ style=bold color="green" fontcolor="black"]
-+"stonith 'on' virt-009" -> "fence_scsi_monitor_0 virt-009" [ style = bold]
-+"stonith 'on' virt-009" [ style=bold color="green" fontcolor="black"]
-+"stonith 'on' virt-013" -> "fence_scsi_monitor_0 virt-013" [ style = bold]
-+"stonith 'on' virt-013" [ style=bold color="green" fontcolor="black"]
-+}
-diff --git a/pengine/test10/unfence-device.exp b/pengine/test10/unfence-device.exp
-new file mode 100644
-index 0000000..98cb548
---- /dev/null
-+++ b/pengine/test10/unfence-device.exp
-@@ -0,0 +1,100 @@
-+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
-+ <synapse id="0">
-+ <action_set>
-+ <rsc_op id="9" operation="monitor" operation_key="fence_scsi_monitor_60000" on_node="virt-008" on_node_uuid="1">
-+ <primitive id="fence_scsi" class="stonith" type="fence_scsi"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="virt-008" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" devices="/dev/disk/by-id/scsi-36001405a853dfde18e94ae885bda3b65,/dev/disk/by-id/scsi-360014059f350cbdba7243278a4b5da87" pcmk_host_check="static-list" pcmk_host_list="virt-008,virt-009,virt-013" pcmk_reboot_action="off"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="8" operation="start" operation_key="fence_scsi_start_0" on_node="virt-008" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="1">
-+ <action_set>
-+ <rsc_op id="8" operation="start" operation_key="fence_scsi_start_0" on_node="virt-008" on_node_uuid="1">
-+ <primitive id="fence_scsi" class="stonith" type="fence_scsi"/>
-+ <attributes CRM_meta_on_node="virt-008" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" devices="/dev/disk/by-id/scsi-36001405a853dfde18e94ae885bda3b65,/dev/disk/by-id/scsi-360014059f350cbdba7243278a4b5da87" pcmk_host_check="static-list" pcmk_host_list="virt-008,virt-009,virt-013" pcmk_reboot_action="off"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="2" operation="monitor" operation_key="fence_scsi_monitor_0" on_node="virt-008" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <crm_event id="3" operation="stonith" operation_key="stonith-virt-008-on" on_node="virt-008" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="4" operation="monitor" operation_key="fence_scsi_monitor_0" on_node="virt-009" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="6" operation="monitor" operation_key="fence_scsi_monitor_0" on_node="virt-013" on_node_uuid="3"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="2">
-+ <action_set>
-+ <rsc_op id="6" operation="monitor" operation_key="fence_scsi_monitor_0" on_node="virt-013" on_node_uuid="3">
-+ <primitive id="fence_scsi" class="stonith" type="fence_scsi"/>
-+ <attributes CRM_meta_on_node="virt-013" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" devices="/dev/disk/by-id/scsi-36001405a853dfde18e94ae885bda3b65,/dev/disk/by-id/scsi-360014059f350cbdba7243278a4b5da87" pcmk_host_check="static-list" pcmk_host_list="virt-008,virt-009,virt-013" pcmk_reboot_action="off"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="7" operation="stonith" operation_key="stonith-virt-013-on" on_node="virt-013" on_node_uuid="3"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="3">
-+ <action_set>
-+ <rsc_op id="4" operation="monitor" operation_key="fence_scsi_monitor_0" on_node="virt-009" on_node_uuid="2">
-+ <primitive id="fence_scsi" class="stonith" type="fence_scsi"/>
-+ <attributes CRM_meta_on_node="virt-009" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" devices="/dev/disk/by-id/scsi-36001405a853dfde18e94ae885bda3b65,/dev/disk/by-id/scsi-360014059f350cbdba7243278a4b5da87" pcmk_host_check="static-list" pcmk_host_list="virt-008,virt-009,virt-013" pcmk_reboot_action="off"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="5" operation="stonith" operation_key="stonith-virt-009-on" on_node="virt-009" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="4">
-+ <action_set>
-+ <rsc_op id="2" operation="monitor" operation_key="fence_scsi_monitor_0" on_node="virt-008" on_node_uuid="1">
-+ <primitive id="fence_scsi" class="stonith" type="fence_scsi"/>
-+ <attributes CRM_meta_on_node="virt-008" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" devices="/dev/disk/by-id/scsi-36001405a853dfde18e94ae885bda3b65,/dev/disk/by-id/scsi-360014059f350cbdba7243278a4b5da87" pcmk_host_check="static-list" pcmk_host_list="virt-008,virt-009,virt-013" pcmk_reboot_action="off"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <crm_event id="3" operation="stonith" operation_key="stonith-virt-008-on" on_node="virt-008" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="5">
-+ <action_set>
-+ <crm_event id="7" operation="stonith" operation_key="stonith-virt-013-on" on_node="virt-013" on_node_uuid="3">
-+ <attributes CRM_meta_on_node="virt-013" CRM_meta_on_node_uuid="3" CRM_meta_shutdown="0" CRM_meta_stonith_action="on" />
-+ </crm_event>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="6">
-+ <action_set>
-+ <crm_event id="5" operation="stonith" operation_key="stonith-virt-009-on" on_node="virt-009" on_node_uuid="2">
-+ <attributes CRM_meta_on_node="virt-009" CRM_meta_on_node_uuid="2" CRM_meta_shutdown="0" CRM_meta_stonith_action="on" />
-+ </crm_event>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="7">
-+ <action_set>
-+ <crm_event id="3" operation="stonith" operation_key="stonith-virt-008-on" on_node="virt-008" on_node_uuid="1">
-+ <attributes CRM_meta_on_node="virt-008" CRM_meta_on_node_uuid="1" CRM_meta_shutdown="0" CRM_meta_stonith_action="on" />
-+ </crm_event>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+</transition_graph>
-diff --git a/pengine/test10/unfence-device.scores b/pengine/test10/unfence-device.scores
-new file mode 100644
-index 0000000..8ea5036
---- /dev/null
-+++ b/pengine/test10/unfence-device.scores
-@@ -0,0 +1,5 @@
-+Allocation scores:
-+Using the original execution date of: 2017-11-30 10:44:29Z
-+native_color: fence_scsi allocation score on virt-008: 0
-+native_color: fence_scsi allocation score on virt-009: 0
-+native_color: fence_scsi allocation score on virt-013: 0
-diff --git a/pengine/test10/unfence-device.summary b/pengine/test10/unfence-device.summary
-new file mode 100644
-index 0000000..181724b
---- /dev/null
-+++ b/pengine/test10/unfence-device.summary
-@@ -0,0 +1,29 @@
-+Using the original execution date of: 2017-11-30 10:44:29Z
-+
-+Current cluster status:
-+Online: [ virt-008 virt-009 virt-013 ]
-+
-+ fence_scsi (stonith:fence_scsi): Stopped
-+
-+Transition Summary:
-+ * Fence (on) virt-013 'required by fence_scsi monitor'
-+ * Fence (on) virt-009 'required by fence_scsi monitor'
-+ * Fence (on) virt-008 'required by fence_scsi monitor'
-+ * Start fence_scsi ( virt-008 )
-+
-+Executing cluster transition:
-+ * Fencing virt-013 (on)
-+ * Fencing virt-009 (on)
-+ * Fencing virt-008 (on)
-+ * Resource action: fence_scsi monitor on virt-013
-+ * Resource action: fence_scsi monitor on virt-009
-+ * Resource action: fence_scsi monitor on virt-008
-+ * Resource action: fence_scsi start on virt-008
-+ * Resource action: fence_scsi monitor=60000 on virt-008
-+Using the original execution date of: 2017-11-30 10:44:29Z
-+
-+Revised cluster status:
-+Online: [ virt-008 virt-009 virt-013 ]
-+
-+ fence_scsi (stonith:fence_scsi): Started virt-008
-+
-diff --git a/pengine/test10/unfence-device.xml b/pengine/test10/unfence-device.xml
-new file mode 100644
-index 0000000..e977d9b
---- /dev/null
-+++ b/pengine/test10/unfence-device.xml
-@@ -0,0 +1,66 @@
-+<cib crm_feature_set="3.0.12" validate-with="pacemaker-2.8" epoch="6" num_updates="0" admin_epoch="0" cib-last-written="Thu Nov 30 11:44:29 2017" update-origin="virt-008" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="2" execution-date="1512038669">
-+ <configuration>
-+ <crm_config>
-+ <cluster_property_set id="cib-bootstrap-options">
-+ <nvpair id="cib-bootstrap-options-have-watchdog" name="have-watchdog" value="false"/>
-+ <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.16-12.el7_4.4-94ff4df"/>
-+ <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
-+ <nvpair id="cib-bootstrap-options-cluster-name" name="cluster-name" value="STSRHTS22676"/>
-+ </cluster_property_set>
-+ </crm_config>
-+ <nodes>
-+ <node id="1" uname="virt-008"/>
-+ <node id="2" uname="virt-009"/>
-+ <node id="3" uname="virt-013"/>
-+ </nodes>
-+ <resources>
-+ <primitive class="stonith" id="fence_scsi" type="fence_scsi">
-+ <instance_attributes id="fence_scsi-instance_attributes">
-+ <nvpair id="fence_scsi-instance_attributes-devices" name="devices" value="/dev/disk/by-id/scsi-36001405a853dfde18e94ae885bda3b65,/dev/disk/by-id/scsi-360014059f350cbdba7243278a4b5da87"/>
-+ <nvpair id="fence_scsi-instance_attributes-pcmk_host_check" name="pcmk_host_check" value="static-list"/>
-+ <nvpair id="fence_scsi-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="virt-008,virt-009,virt-013"/>
-+ <nvpair id="fence_scsi-instance_attributes-pcmk_reboot_action" name="pcmk_reboot_action" value="off"/>
-+ </instance_attributes>
-+ <meta_attributes id="fence_scsi-meta_attributes">
-+ <nvpair id="fence_scsi-meta_attributes-provides" name="provides" value="unfencing"/>
-+ </meta_attributes>
-+ <operations>
-+ <op id="fence_scsi-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ </resources>
-+ <constraints/>
-+ </configuration>
-+ <status>
-+ <node_state id="3" uname="virt-013" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
-+ <lrm id="3">
-+ <lrm_resources/>
-+ </lrm>
-+ <transient_attributes id="3">
-+ <instance_attributes id="status-3">
-+ <nvpair id="status-3-shutdown" name="shutdown" value="0"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state id="1" uname="virt-008" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
-+ <lrm id="1">
-+ <lrm_resources/>
-+ </lrm>
-+ <transient_attributes id="1">
-+ <instance_attributes id="status-1">
-+ <nvpair id="status-1-shutdown" name="shutdown" value="0"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state id="2" uname="virt-009" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
-+ <transient_attributes id="2">
-+ <instance_attributes id="status-2">
-+ <nvpair id="status-2-shutdown" name="shutdown" value="0"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="2">
-+ <lrm_resources/>
-+ </lrm>
-+ </node_state>
-+ </status>
-+</cib>
---
-1.8.3.1
-
-
-From 2948a8e329cda42e5e7e106c0374d49d93b65481 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Wed, 6 Dec 2017 14:05:05 +1100
-Subject: [PATCH 07/16] Fix: PE: Passing boolean instead of a pointer
-
----
- lib/pengine/container.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/pengine/container.c b/lib/pengine/container.c
-index 52b60a4..4d2d876 100644
---- a/lib/pengine/container.c
-+++ b/lib/pengine/container.c
-@@ -557,7 +557,7 @@ create_remote_resource(
- * remote should be ordered relative to docker.
- */
- xml_remote = pe_create_remote_xml(NULL, id, tuple->docker->id,
-- XML_BOOLEAN_FALSE, NULL, "60s", NULL,
-+ NULL, NULL, "60s", NULL,
- NULL, connect_name,
- (data->control_port?
- data->control_port : port_s));
---
-1.8.3.1
-
-
-From f3593e410643dcafa81e28da27c3a623e306fa61 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Wed, 6 Dec 2017 14:48:57 +1100
-Subject: [PATCH 08/16] Fix: PE: Ordering bundle child stops/demotes after
- container fencing causes graph loops
-
----
- include/crm/pengine/status.h | 6 ++++++
- lib/pengine/utils.c | 2 +-
- pengine/allocate.c | 4 +++-
- pengine/native.c | 9 +++++++--
- pengine/test10/bundle-order-fencing.dot | 5 -----
- pengine/test10/bundle-order-fencing.exp | 15 ---------------
- 6 files changed, 17 insertions(+), 24 deletions(-)
-
-diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
-index f2a8910..fca7f12 100644
---- a/include/crm/pengine/status.h
-+++ b/include/crm/pengine/status.h
-@@ -517,4 +517,10 @@ pe_rsc_is_anon_clone(resource_t *rsc)
- return pe_rsc_is_clone(rsc) && is_not_set(rsc->flags, pe_rsc_unique);
- }
-
-+static inline bool
-+pe_rsc_is_bundled(resource_t *rsc)
-+{
-+ return uber_parent(rsc)->parent != NULL;
-+}
-+
- #endif
-diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
-index 0ce0e30..a875226 100644
---- a/lib/pengine/utils.c
-+++ b/lib/pengine/utils.c
-@@ -1015,7 +1015,7 @@ unpack_operation(action_t * action, xmlNode * xml_obj, resource_t * container,
- value = "nothing (resource)";
- }
-
-- pe_rsc_trace(action->rsc, "\tAction %s requires: %s", action->task, value);
-+ pe_rsc_trace(action->rsc, "\tAction %s requires: %s", action->uuid, value);
-
- value = unpack_operation_on_fail(action);
-
-diff --git a/pengine/allocate.c b/pengine/allocate.c
-index 98464a9..2ae491c 100644
---- a/pengine/allocate.c
-+++ b/pengine/allocate.c
-@@ -1470,7 +1470,9 @@ fence_guest(pe_node_t *node, pe_action_t *done, pe_working_set_t *data_set)
-
- /* Order/imply other actions relative to pseudo-fence as with real fence */
- stonith_constraints(node, stonith_op, data_set);
-- order_actions(stonith_op, done, pe_order_implies_then);
-+ if(done) {
-+ order_actions(stonith_op, done, pe_order_implies_then);
-+ }
- }
-
- /*
-diff --git a/pengine/native.c b/pengine/native.c
-index 0013e33..96c9a26 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -3164,7 +3164,9 @@ native_stop_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set_
- */
- flags |= pe_order_preserve;
- }
-- order_actions(stonith_op, action, flags);
-+ if (pe_rsc_is_bundled(rsc) == FALSE) {
-+ order_actions(stonith_op, action, flags);
-+ }
- order_actions(stonith_op, parent_stop, flags);
- }
-
-@@ -3252,7 +3254,10 @@ native_stop_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set_
- update_action_flags(action, pe_action_pseudo, __FUNCTION__, __LINE__);
- update_action_flags(action, pe_action_runnable, __FUNCTION__, __LINE__);
-
-- if (start == NULL || start->needs > rsc_req_quorum) {
-+ if (pe_rsc_is_bundled(rsc)) {
-+ /* Do nothing, let the recovery be ordered after the parent's implied stop */
-+
-+ } else if (start == NULL || start->needs > rsc_req_quorum) {
- order_actions(stonith_op, action, pe_order_preserve|pe_order_optional);
- }
- }
-diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot
-index a7e5805..64b6326 100644
---- a/pengine/test10/bundle-order-fencing.dot
-+++ b/pengine/test10/bundle-order-fencing.dot
-@@ -403,19 +403,14 @@ digraph "g" {
- "redis_stop_0 redis-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed]
- "redis_stop_0 redis-bundle-0" [ style=bold color="green" fontcolor="orange"]
- "stonith 'off' galera-bundle-0" -> "galera-bundle-master_stop_0" [ style = bold]
--"stonith 'off' galera-bundle-0" -> "galera_demote_0 galera-bundle-0" [ style = bold]
--"stonith 'off' galera-bundle-0" -> "galera_stop_0 galera-bundle-0" [ style = bold]
- "stonith 'off' galera-bundle-0" -> "stonith_complete" [ style = bold]
- "stonith 'off' galera-bundle-0" [ style=bold color="green" fontcolor="orange"]
- "stonith 'off' rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_stop_0" [ style = bold]
- "stonith 'off' rabbitmq-bundle-0" -> "rabbitmq_post_notify_stonith_0" [ style = bold]
--"stonith 'off' rabbitmq-bundle-0" -> "rabbitmq_stop_0 rabbitmq-bundle-0" [ style = bold]
- "stonith 'off' rabbitmq-bundle-0" -> "stonith_complete" [ style = bold]
- "stonith 'off' rabbitmq-bundle-0" [ style=bold color="green" fontcolor="orange"]
- "stonith 'off' redis-bundle-0" -> "redis-bundle-master_stop_0" [ style = bold]
--"stonith 'off' redis-bundle-0" -> "redis_demote_0 redis-bundle-0" [ style = bold]
- "stonith 'off' redis-bundle-0" -> "redis_post_notify_stonith_0" [ style = bold]
--"stonith 'off' redis-bundle-0" -> "redis_stop_0 redis-bundle-0" [ style = bold]
- "stonith 'off' redis-bundle-0" -> "stonith_complete" [ style = bold]
- "stonith 'off' redis-bundle-0" [ style=bold color="green" fontcolor="orange"]
- "stonith 'reboot' controller-0" -> "galera-bundle-0_stop_0 controller-0" [ style = bold]
-diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
-index 8e35f32..78ce675 100644
---- a/pengine/test10/bundle-order-fencing.exp
-+++ b/pengine/test10/bundle-order-fencing.exp
-@@ -55,9 +55,6 @@
- <trigger>
- <pseudo_event id="71" operation="stop" operation_key="rabbitmq-bundle-clone_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="209" operation="stonith" operation_key="stonith-rabbitmq-bundle-0-off" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="4">
-@@ -440,9 +437,6 @@
- <trigger>
- <pseudo_event id="108" operation="stop" operation_key="galera-bundle-master_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="208" operation="stonith" operation_key="stonith-galera-bundle-0-off" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="31">
-@@ -455,9 +449,6 @@
- <trigger>
- <pseudo_event id="112" operation="demote" operation_key="galera-bundle-master_demote_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="208" operation="stonith" operation_key="stonith-galera-bundle-0-off" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="32" priority="1000000">
-@@ -701,9 +692,6 @@
- <trigger>
- <pseudo_event id="151" operation="stop" operation_key="redis-bundle-master_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="214" operation="stonith" operation_key="stonith-redis-bundle-0-off" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="50">
-@@ -716,9 +704,6 @@
- <trigger>
- <pseudo_event id="163" operation="demote" operation_key="redis-bundle-master_demote_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="214" operation="stonith" operation_key="stonith-redis-bundle-0-off" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="51" priority="1000000">
---
-1.8.3.1
-
-
-From 906cd4a9e6b871eefb6d113354f9045c1826711a Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Wed, 6 Dec 2017 15:04:21 +1100
-Subject: [PATCH 09/16] Fix: PE: Only allowed nodes need to be considered when
- ordering resource startup after _all_ recovery
-
----
- pengine/native.c | 1 +
- pengine/test10/bundle-order-fencing.dot | 2 --
- pengine/test10/bundle-order-fencing.exp | 6 ------
- pengine/test10/bundle-order-fencing.summary | 8 ++++----
- 4 files changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/pengine/native.c b/pengine/native.c
-index 96c9a26..d4f1ff7 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -3088,6 +3088,7 @@ native_start_constraints(resource_t * rsc, action_t * stonith_op, pe_working_set
- order_actions(stonith_done, action, pe_order_optional);
-
- } else if (safe_str_eq(action->task, RSC_START)
-+ && NULL != pe_hash_table_lookup(rsc->allowed_nodes, target->details->id)
- && NULL == pe_hash_table_lookup(rsc->known_on, target->details->id)) {
- /* if known == NULL, then we don't know if
- * the resource is active on the node
-diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot
-index 64b6326..d653250 100644
---- a/pengine/test10/bundle-order-fencing.dot
-+++ b/pengine/test10/bundle-order-fencing.dot
-@@ -3,8 +3,6 @@ digraph "g" {
- "Cancel redis_monitor_45000 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
- "Cancel redis_monitor_60000 redis-bundle-1" -> "redis_promote_0 redis-bundle-1" [ style = bold]
- "Cancel redis_monitor_60000 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
--"all_stopped" -> "stonith-fence_ipmilan-5254000dcb3f_start_0 controller-2" [ style = bold]
--"all_stopped" -> "stonith-fence_ipmilan-5254003e8e97_start_0 controller-1" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "galera-bundle-0_monitor_0 controller-1" -> "galera-bundle-0_start_0 controller-2" [ style = dashed]
- "galera-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
-index 78ce675..708815f 100644
---- a/pengine/test10/bundle-order-fencing.exp
-+++ b/pengine/test10/bundle-order-fencing.exp
-@@ -1624,9 +1624,6 @@
- </action_set>
- <inputs>
- <trigger>
-- <pseudo_event id="29" operation="all_stopped" operation_key="all_stopped"/>
-- </trigger>
-- <trigger>
- <pseudo_event id="201" operation="stop" operation_key="stonith-fence_ipmilan-5254003e8e97_stop_0"/>
- </trigger>
- </inputs>
-@@ -1661,9 +1658,6 @@
- </action_set>
- <inputs>
- <trigger>
-- <pseudo_event id="29" operation="all_stopped" operation_key="all_stopped"/>
-- </trigger>
-- <trigger>
- <pseudo_event id="204" operation="stop" operation_key="stonith-fence_ipmilan-5254000dcb3f_stop_0"/>
- </trigger>
- </inputs>
-diff --git a/pengine/test10/bundle-order-fencing.summary b/pengine/test10/bundle-order-fencing.summary
-index e78c531..ee2c361 100644
---- a/pengine/test10/bundle-order-fencing.summary
-+++ b/pengine/test10/bundle-order-fencing.summary
-@@ -91,6 +91,8 @@ Executing cluster transition:
- * Pseudo action: redis-bundle-master_demote_0
- * Pseudo action: redis-bundle-0_stop_0
- * Pseudo action: haproxy-bundle-docker-0_stop_0
-+ * Resource action: stonith-fence_ipmilan-5254003e8e97 start on controller-1
-+ * Resource action: stonith-fence_ipmilan-5254000dcb3f start on controller-2
- * Pseudo action: stonith-redis-bundle-0-off on redis-bundle-0
- * Pseudo action: stonith-rabbitmq-bundle-0-off on rabbitmq-bundle-0
- * Pseudo action: stonith-galera-bundle-0-off on galera-bundle-0
-@@ -107,6 +109,8 @@ Executing cluster transition:
- * Pseudo action: ip-192.168.24.7_stop_0
- * Pseudo action: ip-10.0.0.109_stop_0
- * Pseudo action: ip-172.17.4.11_stop_0
-+ * Resource action: stonith-fence_ipmilan-5254003e8e97 monitor=60000 on controller-1
-+ * Resource action: stonith-fence_ipmilan-5254000dcb3f monitor=60000 on controller-2
- * Pseudo action: galera-bundle_demoted_0
- * Pseudo action: galera-bundle_stop_0
- * Pseudo action: rabbitmq_stop_0
-@@ -172,11 +176,7 @@ Executing cluster transition:
- * Pseudo action: rabbitmq-bundle_running_0
- * Pseudo action: all_stopped
- * Pseudo action: redis-bundle-master_running_0
-- * Resource action: stonith-fence_ipmilan-5254003e8e97 start on controller-1
-- * Resource action: stonith-fence_ipmilan-5254000dcb3f start on controller-2
- * Pseudo action: redis-bundle-master_post_notify_running_0
-- * Resource action: stonith-fence_ipmilan-5254003e8e97 monitor=60000 on controller-1
-- * Resource action: stonith-fence_ipmilan-5254000dcb3f monitor=60000 on controller-2
- * Resource action: redis notify on redis-bundle-0
- * Resource action: redis notify on redis-bundle-1
- * Resource action: redis notify on redis-bundle-2
---
-1.8.3.1
-
-
-From c6d208dfbda95d8610519de50075087e56a4f8c0 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Wed, 6 Dec 2017 23:50:12 +1100
-Subject: [PATCH 10/16] Fix: PE: Remote connection resources are safe to to
- require only quorum
-
----
- lib/pengine/complex.c | 6 ++++
- pengine/test10/bug-rh-1097457.dot | 2 +-
- pengine/test10/bug-rh-1097457.exp | 6 ++--
- pengine/test10/bug-rh-1097457.summary | 14 ++++----
- pengine/test10/bundle-order-fencing.dot | 6 ----
- pengine/test10/bundle-order-fencing.exp | 18 ++--------
- pengine/test10/bundle-order-fencing.summary | 8 ++---
- pengine/test10/guest-node-host-dies.dot | 6 ++--
- pengine/test10/guest-node-host-dies.exp | 24 +++++---------
- pengine/test10/guest-node-host-dies.summary | 12 +++----
- pengine/test10/remote-fence-unclean.dot | 2 +-
- pengine/test10/remote-fence-unclean.exp | 2 +-
- pengine/test10/remote-partial-migrate2.dot | 6 +---
- pengine/test10/remote-partial-migrate2.exp | 27 ++++-----------
- pengine/test10/remote-partial-migrate2.summary | 38 +++++++++++-----------
- pengine/test10/remote-recover-all.dot | 3 +-
- pengine/test10/remote-recover-all.exp | 10 ++----
- pengine/test10/remote-recover-all.summary | 8 ++---
- pengine/test10/remote-recover-connection.dot | 6 ----
- pengine/test10/remote-recover-connection.exp | 27 ++-------------
- pengine/test10/remote-recover-connection.summary | 24 +++++++-------
- pengine/test10/remote-recover-fail.dot | 2 +-
- pengine/test10/remote-recover-fail.exp | 2 +-
- pengine/test10/remote-recover-no-resources.dot | 3 +-
- pengine/test10/remote-recover-no-resources.exp | 10 ++----
- pengine/test10/remote-recover-no-resources.summary | 8 ++---
- pengine/test10/remote-recover-unknown.dot | 3 +-
- pengine/test10/remote-recover-unknown.exp | 10 ++----
- pengine/test10/remote-recover-unknown.summary | 8 ++---
- pengine/test10/remote-recovery.dot | 6 ----
- pengine/test10/remote-recovery.exp | 27 ++-------------
- pengine/test10/remote-recovery.summary | 24 +++++++-------
- pengine/test10/remote-unclean2.dot | 2 +-
- pengine/test10/remote-unclean2.exp | 2 +-
- pengine/test10/whitebox-fail1.dot | 2 +-
- pengine/test10/whitebox-fail1.exp | 6 ++--
- pengine/test10/whitebox-fail1.summary | 8 ++---
- pengine/test10/whitebox-fail2.dot | 2 +-
- pengine/test10/whitebox-fail2.exp | 6 ++--
- pengine/test10/whitebox-fail2.summary | 8 ++---
- pengine/test10/whitebox-imply-stop-on-fence.dot | 6 ++--
- pengine/test10/whitebox-imply-stop-on-fence.exp | 24 +++++---------
- .../test10/whitebox-imply-stop-on-fence.summary | 20 ++++++------
- pengine/test10/whitebox-ms-ordering.dot | 4 +--
- pengine/test10/whitebox-ms-ordering.exp | 12 +++----
- pengine/test10/whitebox-ms-ordering.summary | 8 ++---
- pengine/test10/whitebox-unexpectedly-running.dot | 2 ++
- pengine/test10/whitebox-unexpectedly-running.exp | 6 ++++
- 48 files changed, 182 insertions(+), 294 deletions(-)
-
-diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c
-index 3e0abed..d58d6be 100644
---- a/lib/pengine/complex.c
-+++ b/lib/pengine/complex.c
-@@ -784,6 +784,12 @@ common_unpack(xmlNode * xml_obj, resource_t ** rsc,
- if(is_set((*rsc)->flags, pe_rsc_fence_device)) {
- value = "quorum";
-
-+ } else if (safe_str_eq(crm_element_value((*rsc)->xml, XML_AGENT_ATTR_CLASS), "ocf")
-+ && safe_str_eq(crm_element_value((*rsc)->xml, XML_AGENT_ATTR_PROVIDER), "pacemaker")
-+ && safe_str_eq(crm_element_value((*rsc)->xml, XML_ATTR_TYPE), "remote")
-+ ) {
-+ value = "quorum";
-+
- } else if (is_set(data_set->flags, pe_flag_enable_unfencing)) {
- value = "unfencing";
-
-diff --git a/pengine/test10/bug-rh-1097457.dot b/pengine/test10/bug-rh-1097457.dot
-index 5984811..94ffe13 100644
---- a/pengine/test10/bug-rh-1097457.dot
-+++ b/pengine/test10/bug-rh-1097457.dot
-@@ -80,6 +80,7 @@ digraph "g" {
- "VM2_stop_0 lama3" -> "all_stopped" [ style = bold]
- "VM2_stop_0 lama3" -> "stonith 'reboot' lamaVM2" [ style = bold]
- "VM2_stop_0 lama3" [ style=bold color="green" fontcolor="black"]
-+"all_stopped" -> "lamaVM2_start_0 lama3" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "lamaVM2-G4_running_0" [ style=bold color="green" fontcolor="orange"]
- "lamaVM2-G4_start_0" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
-@@ -121,6 +122,5 @@ digraph "g" {
- "stonith_complete" -> "FSlun3_start_0 lama2" [ style = bold]
- "stonith_complete" -> "VM2_start_0 lama3" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "lamaVM2_start_0 lama3" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp
-index 4eedd91..f1451b5 100644
---- a/pengine/test10/bug-rh-1097457.exp
-+++ b/pengine/test10/bug-rh-1097457.exp
-@@ -599,13 +599,13 @@
- </action_set>
- <inputs>
- <trigger>
-- <rsc_op id="57" operation="start" operation_key="VM2_start_0" on_node="lama3" on_node_uuid="2"/>
-+ <pseudo_event id="25" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <rsc_op id="111" operation="stop" operation_key="lamaVM2_stop_0" on_node="lama3" on_node_uuid="2"/>
-+ <rsc_op id="57" operation="start" operation_key="VM2_start_0" on_node="lama3" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <pseudo_event id="115" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <rsc_op id="111" operation="stop" operation_key="lamaVM2_stop_0" on_node="lama3" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-rh-1097457.summary b/pengine/test10/bug-rh-1097457.summary
-index e23c6ad..0e7d2e0 100644
---- a/pengine/test10/bug-rh-1097457.summary
-+++ b/pengine/test10/bug-rh-1097457.summary
-@@ -70,26 +70,26 @@ Executing cluster transition:
- * Pseudo action: lamaVM2-G4_stop_0
- * Pseudo action: FAKE4-IP_stop_0
- * Pseudo action: FAKE6-clone_stop_0
-- * Resource action: lamaVM2 start on lama3
-- * Resource action: lamaVM2 monitor=30000 on lama3
-- * Resource action: FSlun3 monitor=10000 on lamaVM2
- * Pseudo action: FAKE4_stop_0
- * Pseudo action: FAKE6_stop_0
- * Pseudo action: FAKE6-clone_stopped_0
- * Pseudo action: FAKE6-clone_start_0
- * Pseudo action: lamaVM2-G4_stopped_0
-- * Resource action: FAKE6 start on lamaVM2
-- * Resource action: FAKE6 monitor=30000 on lamaVM2
-- * Pseudo action: FAKE6-clone_running_0
- * Pseudo action: FSlun3_stop_0
- * Pseudo action: all_stopped
- * Resource action: FSlun3 start on lama2
- * Pseudo action: lamaVM2-G4_start_0
-+ * Resource action: lamaVM2 start on lama3
-+ * Resource action: lamaVM2 monitor=30000 on lama3
-+ * Resource action: FSlun3 monitor=10000 on lama2
-+ * Resource action: FSlun3 monitor=10000 on lamaVM2
- * Resource action: FAKE4 start on lamaVM2
- * Resource action: FAKE4 monitor=30000 on lamaVM2
- * Resource action: FAKE4-IP start on lamaVM2
- * Resource action: FAKE4-IP monitor=30000 on lamaVM2
-- * Resource action: FSlun3 monitor=10000 on lama2
-+ * Resource action: FAKE6 start on lamaVM2
-+ * Resource action: FAKE6 monitor=30000 on lamaVM2
-+ * Pseudo action: FAKE6-clone_running_0
- * Pseudo action: lamaVM2-G4_running_0
-
- Revised cluster status:
-diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot
-index d653250..980bab4 100644
---- a/pengine/test10/bundle-order-fencing.dot
-+++ b/pengine/test10/bundle-order-fencing.dot
-@@ -411,15 +411,12 @@ digraph "g" {
- "stonith 'off' redis-bundle-0" -> "redis_post_notify_stonith_0" [ style = bold]
- "stonith 'off' redis-bundle-0" -> "stonith_complete" [ style = bold]
- "stonith 'off' redis-bundle-0" [ style=bold color="green" fontcolor="orange"]
--"stonith 'reboot' controller-0" -> "galera-bundle-0_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "galera-bundle-docker-0_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "haproxy-bundle-docker-0_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "ip-10.0.0.109_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "ip-172.17.4.11_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "ip-192.168.24.7_stop_0 controller-0" [ style = bold]
--"stonith 'reboot' controller-0" -> "rabbitmq-bundle-0_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "rabbitmq-bundle-docker-0_stop_0 controller-0" [ style = bold]
--"stonith 'reboot' controller-0" -> "redis-bundle-0_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "redis-bundle-docker-0_stop_0 controller-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "stonith 'off' galera-bundle-0" [ style = bold]
- "stonith 'reboot' controller-0" -> "stonith 'off' rabbitmq-bundle-0" [ style = bold]
-@@ -439,14 +436,11 @@ digraph "g" {
- "stonith-fence_ipmilan-5254003e8e97_stop_0 controller-0" -> "stonith-fence_ipmilan-5254003e8e97_start_0 controller-1" [ style = bold]
- "stonith-fence_ipmilan-5254003e8e97_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "galera-bundle-0_start_0 controller-2" [ style = dashed]
- "stonith_complete" -> "galera_start_0 galera-bundle-0" [ style = dashed]
- "stonith_complete" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold]
- "stonith_complete" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold]
- "stonith_complete" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold]
--"stonith_complete" -> "rabbitmq-bundle-0_start_0 controller-1" [ style = dashed]
- "stonith_complete" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed]
--"stonith_complete" -> "redis-bundle-0_start_0 controller-1" [ style = dashed]
- "stonith_complete" -> "redis_promote_0 redis-bundle-1" [ style = bold]
- "stonith_complete" -> "redis_start_0 redis-bundle-0" [ style = dashed]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
-diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
-index 708815f..dc4c5c9 100644
---- a/pengine/test10/bundle-order-fencing.exp
-+++ b/pengine/test10/bundle-order-fencing.exp
-@@ -379,11 +379,7 @@
- <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_timeout="20000" addr="controller-0" port="3122"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="26">
- <action_set>
-@@ -565,11 +561,7 @@
- <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_timeout="20000" addr="controller-0" port="3123"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="40">
- <action_set>
-@@ -1413,11 +1405,7 @@
- <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_timeout="20000" addr="controller-0" port="3124"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="97">
- <action_set>
-diff --git a/pengine/test10/bundle-order-fencing.summary b/pengine/test10/bundle-order-fencing.summary
-index ee2c361..0457f83 100644
---- a/pengine/test10/bundle-order-fencing.summary
-+++ b/pengine/test10/bundle-order-fencing.summary
-@@ -56,10 +56,12 @@ Transition Summary:
-
- Executing cluster transition:
- * Pseudo action: rabbitmq-bundle-clone_pre_notify_stop_0
-+ * Pseudo action: rabbitmq-bundle-0_stop_0
- * Resource action: rabbitmq-bundle-0 monitor on controller-2
- * Resource action: rabbitmq-bundle-0 monitor on controller-1
- * Resource action: rabbitmq-bundle-1 monitor on controller-2
- * Resource action: rabbitmq-bundle-2 monitor on controller-1
-+ * Pseudo action: galera-bundle-0_stop_0
- * Resource action: galera-bundle-0 monitor on controller-2
- * Resource action: galera-bundle-0 monitor on controller-1
- * Resource action: galera-bundle-1 monitor on controller-2
-@@ -67,6 +69,7 @@ Executing cluster transition:
- * Resource action: redis cancel=45000 on redis-bundle-1
- * Resource action: redis cancel=60000 on redis-bundle-1
- * Pseudo action: redis-bundle-master_pre_notify_demote_0
-+ * Pseudo action: redis-bundle-0_stop_0
- * Resource action: redis-bundle-0 monitor on controller-2
- * Resource action: redis-bundle-0 monitor on controller-1
- * Resource action: redis-bundle-1 monitor on controller-2
-@@ -82,14 +85,12 @@ Executing cluster transition:
- * Resource action: rabbitmq notify on rabbitmq-bundle-1
- * Resource action: rabbitmq notify on rabbitmq-bundle-2
- * Pseudo action: rabbitmq-bundle-clone_confirmed-pre_notify_stop_0
-- * Pseudo action: rabbitmq-bundle-0_stop_0
-+ * Pseudo action: rabbitmq-bundle-docker-0_stop_0
- * Pseudo action: galera-bundle-master_demote_0
-- * Pseudo action: galera-bundle-0_stop_0
- * Resource action: redis notify on redis-bundle-1
- * Resource action: redis notify on redis-bundle-2
- * Pseudo action: redis-bundle-master_confirmed-pre_notify_demote_0
- * Pseudo action: redis-bundle-master_demote_0
-- * Pseudo action: redis-bundle-0_stop_0
- * Pseudo action: haproxy-bundle-docker-0_stop_0
- * Resource action: stonith-fence_ipmilan-5254003e8e97 start on controller-1
- * Resource action: stonith-fence_ipmilan-5254000dcb3f start on controller-2
-@@ -100,7 +101,6 @@ Executing cluster transition:
- * Pseudo action: haproxy-bundle_stopped_0
- * Pseudo action: rabbitmq_post_notify_stop_0
- * Pseudo action: rabbitmq-bundle-clone_stop_0
-- * Pseudo action: rabbitmq-bundle-docker-0_stop_0
- * Pseudo action: galera_demote_0
- * Pseudo action: galera-bundle-master_demoted_0
- * Pseudo action: redis_post_notify_stop_0
-diff --git a/pengine/test10/guest-node-host-dies.dot b/pengine/test10/guest-node-host-dies.dot
-index a85250d..c50e071 100644
---- a/pengine/test10/guest-node-host-dies.dot
-+++ b/pengine/test10/guest-node-host-dies.dot
-@@ -6,6 +6,8 @@ digraph "g" {
- "Fencing_stop_0 rhel7-4" -> "all_stopped" [ style = bold]
- "Fencing_stop_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
- "all_stopped" -> "Fencing_start_0 rhel7-4" [ style = bold]
-+"all_stopped" -> "lxc1_start_0 rhel7-2" [ style = bold]
-+"all_stopped" -> "lxc2_start_0 rhel7-3" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "container1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
- "container1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold]
-@@ -115,8 +117,6 @@ digraph "g" {
- "stonith 'reboot' lxc2" [ style=bold color="green" fontcolor="orange"]
- "stonith 'reboot' rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold]
- "stonith 'reboot' rhel7-1" -> "container2_stop_0 rhel7-1" [ style = bold]
--"stonith 'reboot' rhel7-1" -> "lxc1_stop_0 rhel7-1" [ style = bold]
--"stonith 'reboot' rhel7-1" -> "lxc2_stop_0 rhel7-1" [ style = bold]
- "stonith 'reboot' rhel7-1" -> "rsc_rhel7-1_stop_0 rhel7-1" [ style = bold]
- "stonith 'reboot' rhel7-1" -> "stonith_complete" [ style = bold]
- "stonith 'reboot' rhel7-1" [ style=bold color="green" fontcolor="black"]
-@@ -126,8 +126,6 @@ digraph "g" {
- "stonith_complete" -> "lxc-ms_promote_0 lxc1" [ style = bold]
- "stonith_complete" -> "lxc-ms_start_0 lxc1" [ style = bold]
- "stonith_complete" -> "lxc-ms_start_0 lxc2" [ style = bold]
--"stonith_complete" -> "lxc1_start_0 rhel7-2" [ style = bold]
--"stonith_complete" -> "lxc2_start_0 rhel7-3" [ style = bold]
- "stonith_complete" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/guest-node-host-dies.exp b/pengine/test10/guest-node-host-dies.exp
-index 8dbadde..b5a34ea 100644
---- a/pengine/test10/guest-node-host-dies.exp
-+++ b/pengine/test10/guest-node-host-dies.exp
-@@ -432,6 +432,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
- </trigger>
- <trigger>
-@@ -446,9 +449,6 @@
- <trigger>
- <pseudo_event id="34" operation="stop" operation_key="lxc1_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="27">
-@@ -457,11 +457,7 @@
- <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" />
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="28">
- <action_set>
-@@ -512,6 +508,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="5" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
- </trigger>
- <trigger>
-@@ -526,9 +525,6 @@
- <trigger>
- <pseudo_event id="37" operation="stop" operation_key="lxc2_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="33">
-@@ -537,11 +533,7 @@
- <attributes CRM_meta_container="container2" CRM_meta_timeout="20000" />
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="34">
- <action_set>
-diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
-index 4feee88..9813d2b 100644
---- a/pengine/test10/guest-node-host-dies.summary
-+++ b/pengine/test10/guest-node-host-dies.summary
-@@ -26,16 +26,16 @@ Transition Summary:
- Executing cluster transition:
- * Resource action: Fencing stop on rhel7-4
- * Pseudo action: lxc-ms-master_demote_0
-+ * Pseudo action: lxc1_stop_0
- * Resource action: lxc1 monitor on rhel7-5
- * Resource action: lxc1 monitor on rhel7-4
- * Resource action: lxc1 monitor on rhel7-3
-+ * Pseudo action: lxc2_stop_0
- * Resource action: lxc2 monitor on rhel7-5
- * Resource action: lxc2 monitor on rhel7-4
- * Resource action: lxc2 monitor on rhel7-2
- * Fencing rhel7-1 (reboot)
- * Pseudo action: rsc_rhel7-1_stop_0
-- * Pseudo action: lxc1_stop_0
-- * Pseudo action: lxc2_stop_0
- * Pseudo action: container1_stop_0
- * Pseudo action: container2_stop_0
- * Pseudo action: stonith-lxc2-reboot on lxc2
-@@ -47,21 +47,21 @@ Executing cluster transition:
- * Pseudo action: lxc-ms_demote_0
- * Pseudo action: lxc-ms-master_demoted_0
- * Pseudo action: lxc-ms-master_stop_0
-- * Resource action: lxc1 start on rhel7-2
-- * Resource action: lxc2 start on rhel7-3
- * Resource action: rsc_rhel7-1 monitor=5000 on rhel7-5
- * Pseudo action: lxc-ms_stop_0
- * Pseudo action: lxc-ms_stop_0
- * Pseudo action: lxc-ms-master_stopped_0
- * Pseudo action: lxc-ms-master_start_0
-- * Resource action: lxc1 monitor=30000 on rhel7-2
-- * Resource action: lxc2 monitor=30000 on rhel7-3
- * Pseudo action: all_stopped
- * Resource action: Fencing start on rhel7-4
- * Resource action: Fencing monitor=120000 on rhel7-4
-+ * Resource action: lxc1 start on rhel7-2
-+ * Resource action: lxc2 start on rhel7-3
- * Resource action: lxc-ms start on lxc1
- * Resource action: lxc-ms start on lxc2
- * Pseudo action: lxc-ms-master_running_0
-+ * Resource action: lxc1 monitor=30000 on rhel7-2
-+ * Resource action: lxc2 monitor=30000 on rhel7-3
- * Resource action: lxc-ms monitor=10000 on lxc2
- * Pseudo action: lxc-ms-master_promote_0
- * Resource action: lxc-ms promote on lxc1
-diff --git a/pengine/test10/remote-fence-unclean.dot b/pengine/test10/remote-fence-unclean.dot
-index b2829a7..76a676d 100644
---- a/pengine/test10/remote-fence-unclean.dot
-+++ b/pengine/test10/remote-fence-unclean.dot
-@@ -18,6 +18,7 @@
- "FAKE4_stop_0 18node1" -> "FAKE4_start_0 18node2" [ style = bold]
- "FAKE4_stop_0 18node1" -> "all_stopped" [ style = bold]
- "FAKE4_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-+"all_stopped" -> "remote1_start_0 18node1" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
- "remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold]
-@@ -32,6 +33,5 @@
- "stonith_complete" -> "FAKE3_start_0 18node1" [ style = bold]
- "stonith_complete" -> "FAKE4_start_0 18node2" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "remote1_start_0 18node1" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/remote-fence-unclean.exp b/pengine/test10/remote-fence-unclean.exp
-index 3a07384..f77d7f6 100644
---- a/pengine/test10/remote-fence-unclean.exp
-+++ b/pengine/test10/remote-fence-unclean.exp
-@@ -11,7 +11,7 @@
- <rsc_op id="6" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-partial-migrate2.dot b/pengine/test10/remote-partial-migrate2.dot
-index a8bf29b..17c8bf3 100644
---- a/pengine/test10/remote-partial-migrate2.dot
-+++ b/pengine/test10/remote-partial-migrate2.dot
-@@ -89,6 +89,7 @@
- "FAKE9_stop_0 pcmk2" -> "FAKE9_start_0 pcmk_remote4" [ style = bold]
- "FAKE9_stop_0 pcmk2" -> "all_stopped" [ style = bold]
- "FAKE9_stop_0 pcmk2" [ style=bold color="green" fontcolor="black"]
-+"all_stopped" -> "pcmk_remote5_start_0 pcmk2" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "pcmk_remote2_migrate_from_0 pcmk1" -> "pcmk_remote2_start_0 pcmk1" [ style = bold]
- "pcmk_remote2_migrate_from_0 pcmk1" -> "pcmk_remote2_stop_0 pcmk3" [ style = bold]
-@@ -150,10 +151,5 @@
- "stonith_complete" -> "FAKE5_start_0 pcmk_remote4" [ style = bold]
- "stonith_complete" -> "FAKE9_start_0 pcmk_remote4" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "pcmk_remote2_migrate_from_0 pcmk1" [ style = bold]
--"stonith_complete" -> "pcmk_remote2_start_0 pcmk1" [ style = bold]
--"stonith_complete" -> "pcmk_remote4_start_0 pcmk2" [ style = bold]
--"stonith_complete" -> "pcmk_remote5_migrate_to_0 pcmk1" [ style = bold]
--"stonith_complete" -> "pcmk_remote5_start_0 pcmk2" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/remote-partial-migrate2.exp b/pengine/test10/remote-partial-migrate2.exp
-index abf281f..bae190c 100644
---- a/pengine/test10/remote-partial-migrate2.exp
-+++ b/pengine/test10/remote-partial-migrate2.exp
-@@ -6,11 +6,7 @@
- <attributes CRM_meta_migrate_source="pcmk3" CRM_meta_migrate_target="pcmk1" CRM_meta_on_node="pcmk1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" server="172.17.201.2"/>
- </rsc_op>
- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="189" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="1">
- <action_set>
-@@ -38,9 +34,6 @@
- <trigger>
- <rsc_op id="64" operation="migrate_from" operation_key="pcmk_remote2_migrate_from_0" on_node="pcmk1" on_node_uuid="1"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="189" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="3">
-@@ -76,11 +69,7 @@
- <attributes CRM_meta_name="start" CRM_meta_on_node="pcmk2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="10000" server="172.17.201.4"/>
- </rsc_op>
- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="189" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="6">
- <action_set>
-@@ -102,11 +91,7 @@
- <attributes CRM_meta_migrate_source="pcmk1" CRM_meta_migrate_target="pcmk2" CRM_meta_on_node="pcmk1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" server="172.17.201.5"/>
- </rsc_op>
- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="189" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="8">
- <action_set>
-@@ -129,13 +114,13 @@
- </action_set>
- <inputs>
- <trigger>
-- <rsc_op id="69" operation="stop" operation_key="pcmk_remote5_stop_0" on_node="pcmk1" on_node_uuid="1"/>
-+ <pseudo_event id="56" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <rsc_op id="73" operation="migrate_from" operation_key="pcmk_remote5_migrate_from_0" on_node="pcmk2" on_node_uuid="2"/>
-+ <rsc_op id="69" operation="stop" operation_key="pcmk_remote5_stop_0" on_node="pcmk1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <pseudo_event id="189" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <rsc_op id="73" operation="migrate_from" operation_key="pcmk_remote5_migrate_from_0" on_node="pcmk2" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-partial-migrate2.summary b/pengine/test10/remote-partial-migrate2.summary
-index 2a242bd..6b6428d 100644
---- a/pengine/test10/remote-partial-migrate2.summary
-+++ b/pengine/test10/remote-partial-migrate2.summary
-@@ -84,6 +84,10 @@ Transition Summary:
- * Move FAKE49 ( pcmk_remote3 -> pcmk_remote4 )
-
- Executing cluster transition:
-+ * Resource action: pcmk_remote2 migrate_from on pcmk1
-+ * Resource action: pcmk_remote2 stop on pcmk3
-+ * Resource action: pcmk_remote4 start on pcmk2
-+ * Resource action: pcmk_remote5 migrate_to on pcmk1
- * Resource action: FAKE5 stop on pcmk1
- * Resource action: FAKE9 stop on pcmk2
- * Resource action: FAKE12 stop on pcmk1
-@@ -99,11 +103,15 @@ Executing cluster transition:
- * Resource action: FAKE48 stop on pcmk1
- * Resource action: FAKE49 stop on pcmk_remote3
- * Fencing pcmk4 (reboot)
-+ * Pseudo action: pcmk_remote2_start_0
-+ * Resource action: pcmk_remote4 monitor=60000 on pcmk2
-+ * Resource action: pcmk_remote5 migrate_from on pcmk2
-+ * Resource action: pcmk_remote5 stop on pcmk1
-+ * Resource action: FAKE41 stop on pcmk_remote2
- * Pseudo action: stonith_complete
-- * Resource action: pcmk_remote2 migrate_from on pcmk1
-- * Resource action: pcmk_remote2 stop on pcmk3
-- * Resource action: pcmk_remote4 start on pcmk2
-- * Resource action: pcmk_remote5 migrate_to on pcmk1
-+ * Pseudo action: all_stopped
-+ * Resource action: pcmk_remote2 monitor=60000 on pcmk1
-+ * Pseudo action: pcmk_remote5_start_0
- * Resource action: FAKE5 start on pcmk_remote4
- * Resource action: FAKE9 start on pcmk_remote4
- * Resource action: FAKE12 start on pcmk2
-@@ -114,12 +122,12 @@ Executing cluster transition:
- * Resource action: FAKE30 start on pcmk_remote1
- * Resource action: FAKE33 start on pcmk_remote4
- * Resource action: FAKE38 start on pcmk_remote1
-+ * Resource action: FAKE39 start on pcmk_remote2
-+ * Resource action: FAKE41 start on pcmk_remote4
-+ * Resource action: FAKE47 start on pcmk_remote2
- * Resource action: FAKE48 start on pcmk_remote3
- * Resource action: FAKE49 start on pcmk_remote4
-- * Pseudo action: pcmk_remote2_start_0
-- * Resource action: pcmk_remote4 monitor=60000 on pcmk2
-- * Resource action: pcmk_remote5 migrate_from on pcmk2
-- * Resource action: pcmk_remote5 stop on pcmk1
-+ * Resource action: pcmk_remote5 monitor=60000 on pcmk2
- * Resource action: FAKE5 monitor=10000 on pcmk_remote4
- * Resource action: FAKE9 monitor=10000 on pcmk_remote4
- * Resource action: FAKE12 monitor=10000 on pcmk2
-@@ -130,19 +138,11 @@ Executing cluster transition:
- * Resource action: FAKE30 monitor=10000 on pcmk_remote1
- * Resource action: FAKE33 monitor=10000 on pcmk_remote4
- * Resource action: FAKE38 monitor=10000 on pcmk_remote1
-- * Resource action: FAKE39 start on pcmk_remote2
-- * Resource action: FAKE41 stop on pcmk_remote2
-- * Resource action: FAKE47 start on pcmk_remote2
-- * Resource action: FAKE48 monitor=10000 on pcmk_remote3
-- * Resource action: FAKE49 monitor=10000 on pcmk_remote4
-- * Pseudo action: all_stopped
-- * Resource action: pcmk_remote2 monitor=60000 on pcmk1
-- * Pseudo action: pcmk_remote5_start_0
- * Resource action: FAKE39 monitor=10000 on pcmk_remote2
-- * Resource action: FAKE41 start on pcmk_remote4
-- * Resource action: FAKE47 monitor=10000 on pcmk_remote2
-- * Resource action: pcmk_remote5 monitor=60000 on pcmk2
- * Resource action: FAKE41 monitor=10000 on pcmk_remote4
-+ * Resource action: FAKE47 monitor=10000 on pcmk_remote2
-+ * Resource action: FAKE48 monitor=10000 on pcmk_remote3
-+ * Resource action: FAKE49 monitor=10000 on pcmk_remote4
-
- Revised cluster status:
- Online: [ pcmk1 pcmk2 pcmk3 ]
-diff --git a/pengine/test10/remote-recover-all.dot b/pengine/test10/remote-recover-all.dot
-index ad421e6..5b79602 100644
---- a/pengine/test10/remote-recover-all.dot
-+++ b/pengine/test10/remote-recover-all.dot
-@@ -1,4 +1,5 @@
- digraph "g" {
-+"all_stopped" -> "galera-0_start_0 controller-2" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-@@ -114,7 +115,6 @@ digraph "g" {
- "redis_stop_0 controller-1" -> "all_stopped" [ style = bold]
- "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold]
- "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
--"stonith 'reboot' controller-1" -> "galera-0_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold]
-@@ -156,7 +156,6 @@ digraph "g" {
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "galera-0_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
-diff --git a/pengine/test10/remote-recover-all.exp b/pengine/test10/remote-recover-all.exp
-index b0af5c4..556ccfd 100644
---- a/pengine/test10/remote-recover-all.exp
-+++ b/pengine/test10/remote-recover-all.exp
-@@ -36,10 +36,10 @@
- </action_set>
- <inputs>
- <trigger>
-- <pseudo_event id="30" operation="stop" operation_key="galera-0_stop_0"/>
-+ <pseudo_event id="22" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <pseudo_event id="125" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="30" operation="stop" operation_key="galera-0_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -49,11 +49,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="4">
- <action_set>
-diff --git a/pengine/test10/remote-recover-all.summary b/pengine/test10/remote-recover-all.summary
-index 6c9f058..ba074e5 100644
---- a/pengine/test10/remote-recover-all.summary
-+++ b/pengine/test10/remote-recover-all.summary
-@@ -56,13 +56,13 @@ Transition Summary:
- * Move stonith-fence_ipmilan-5254005bdbb5 ( controller-1 -> controller-2 )
-
- Executing cluster transition:
-+ * Pseudo action: galera-0_stop_0
- * Pseudo action: galera-master_demote_0
- * Pseudo action: redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
- * Pseudo action: stonith-fence_ipmilan-5254005bdbb5_stop_0
- * Fencing controller-1 (reboot)
-- * Pseudo action: galera-0_stop_0
- * Pseudo action: redis_post_notify_stop_0
- * Resource action: redis notify on controller-0
- * Resource action: redis notify on controller-2
-@@ -79,17 +79,14 @@ Executing cluster transition:
- * Pseudo action: haproxy-clone_stopped_0
- * Fencing messaging-1 (reboot)
- * Pseudo action: stonith_complete
-- * Resource action: galera-0 start on controller-2
- * Pseudo action: rabbitmq_post_notify_stop_0
- * Pseudo action: rabbitmq-clone_stop_0
- * Pseudo action: galera_stop_0
-- * Resource action: galera monitor=10000 on galera-0
- * Pseudo action: galera-master_stopped_0
- * Pseudo action: redis-master_post_notify_stopped_0
- * Pseudo action: ip-172.17.1.14_stop_0
- * Pseudo action: ip-172.17.1.17_stop_0
- * Pseudo action: ip-172.17.4.11_stop_0
-- * Resource action: galera-0 monitor=20000 on controller-2
- * Pseudo action: galera-2_stop_0
- * Resource action: rabbitmq notify on messaging-2
- * Resource action: rabbitmq notify on messaging-0
-@@ -108,11 +105,14 @@ Executing cluster transition:
- * Resource action: ip-172.17.1.17 monitor=10000 on controller-2
- * Resource action: ip-172.17.4.11 monitor=10000 on controller-2
- * Pseudo action: all_stopped
-+ * Resource action: galera-0 start on controller-2
-+ * Resource action: galera monitor=10000 on galera-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
-+ * Resource action: galera-0 monitor=20000 on controller-2
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2
- Using the original execution date of: 2017-05-03 13:33:24Z
-
-diff --git a/pengine/test10/remote-recover-connection.dot b/pengine/test10/remote-recover-connection.dot
-index d6fdefe..6cd342f 100644
---- a/pengine/test10/remote-recover-connection.dot
-+++ b/pengine/test10/remote-recover-connection.dot
-@@ -89,14 +89,11 @@ digraph "g" {
- "redis_stop_0 controller-1" -> "all_stopped" [ style = bold]
- "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold]
- "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
--"stonith 'reboot' controller-1" -> "galera-0_stop_0 controller-1" [ style = bold]
--"stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold]
--"stonith 'reboot' controller-1" -> "messaging-1_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "redis_post_notify_stonith_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold]
-@@ -121,11 +118,8 @@ digraph "g" {
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "galera-0_start_0 controller-2" [ style = bold]
--"stonith_complete" -> "galera-2_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
--"stonith_complete" -> "messaging-1_start_0 controller-2" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/remote-recover-connection.exp b/pengine/test10/remote-recover-connection.exp
-index cf74efb..40338b4 100644
---- a/pengine/test10/remote-recover-connection.exp
-+++ b/pengine/test10/remote-recover-connection.exp
-@@ -23,9 +23,6 @@
- <trigger>
- <pseudo_event id="27" operation="stop" operation_key="messaging-1_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="132" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="2">
-@@ -34,11 +31,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="3">
- <action_set>
-@@ -64,9 +57,6 @@
- <trigger>
- <pseudo_event id="32" operation="stop" operation_key="galera-0_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="132" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="5">
-@@ -75,11 +65,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="6">
- <action_set>
-@@ -105,9 +91,6 @@
- <trigger>
- <pseudo_event id="37" operation="stop" operation_key="galera-2_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="132" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="8">
-@@ -116,11 +99,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="9">
- <action_set>
-diff --git a/pengine/test10/remote-recover-connection.summary b/pengine/test10/remote-recover-connection.summary
-index b0433fe..8246cd9 100644
---- a/pengine/test10/remote-recover-connection.summary
-+++ b/pengine/test10/remote-recover-connection.summary
-@@ -52,6 +52,9 @@ Transition Summary:
- * Move stonith-fence_ipmilan-5254005bdbb5 ( controller-1 -> controller-2 )
-
- Executing cluster transition:
-+ * Pseudo action: messaging-1_stop_0
-+ * Pseudo action: galera-0_stop_0
-+ * Pseudo action: galera-2_stop_0
- * Pseudo action: redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
-@@ -61,9 +64,12 @@ Executing cluster transition:
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
- * Pseudo action: stonith-fence_ipmilan-5254005bdbb5_stop_0
- * Fencing controller-1 (reboot)
-- * Pseudo action: messaging-1_stop_0
-- * Pseudo action: galera-0_stop_0
-- * Pseudo action: galera-2_stop_0
-+ * Resource action: messaging-1 start on controller-2
-+ * Resource action: galera-0 start on controller-2
-+ * Resource action: galera-2 start on controller-2
-+ * Resource action: rabbitmq monitor=10000 on messaging-1
-+ * Resource action: galera monitor=10000 on galera-2
-+ * Resource action: galera monitor=10000 on galera-0
- * Pseudo action: redis_post_notify_stop_0
- * Resource action: redis notify on controller-0
- * Resource action: redis notify on controller-2
-@@ -72,20 +78,14 @@ Executing cluster transition:
- * Pseudo action: haproxy-clone_stop_0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
- * Pseudo action: stonith_complete
-- * Resource action: messaging-1 start on controller-2
-- * Resource action: galera-0 start on controller-2
-- * Resource action: galera-2 start on controller-2
-- * Resource action: rabbitmq monitor=10000 on messaging-1
-- * Resource action: galera monitor=10000 on galera-2
-- * Resource action: galera monitor=10000 on galera-0
-+ * Resource action: messaging-1 monitor=20000 on controller-2
-+ * Resource action: galera-0 monitor=20000 on controller-2
-+ * Resource action: galera-2 monitor=20000 on controller-2
- * Pseudo action: redis_stop_0
- * Pseudo action: redis-master_stopped_0
- * Pseudo action: haproxy_stop_0
- * Pseudo action: haproxy-clone_stopped_0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2
-- * Resource action: messaging-1 monitor=20000 on controller-2
-- * Resource action: galera-0 monitor=20000 on controller-2
-- * Resource action: galera-2 monitor=20000 on controller-2
- * Pseudo action: redis-master_post_notify_stopped_0
- * Pseudo action: ip-172.17.1.14_stop_0
- * Pseudo action: ip-172.17.1.17_stop_0
-diff --git a/pengine/test10/remote-recover-fail.dot b/pengine/test10/remote-recover-fail.dot
-index 7b6edaa..3375687 100644
---- a/pengine/test10/remote-recover-fail.dot
-+++ b/pengine/test10/remote-recover-fail.dot
-@@ -18,6 +18,7 @@
- "FAKE6_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold]
- "FAKE6_stop_0 rhel7-auto4" -> "rhel7-auto4_stop_0 rhel7-auto2" [ style = bold]
- "FAKE6_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="orange"]
-+"all_stopped" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "rhel7-auto4_monitor_60000 rhel7-auto2" [ style=bold color="green" fontcolor="black"]
- "rhel7-auto4_start_0 rhel7-auto2" -> "rhel7-auto4_monitor_60000 rhel7-auto2" [ style = bold]
-@@ -33,6 +34,5 @@
- "stonith_complete" -> "FAKE2_start_0 rhel7-auto3" [ style = bold]
- "stonith_complete" -> "FAKE6_start_0 rhel7-auto2" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/remote-recover-fail.exp b/pengine/test10/remote-recover-fail.exp
-index bd014ae..f908566 100644
---- a/pengine/test10/remote-recover-fail.exp
-+++ b/pengine/test10/remote-recover-fail.exp
-@@ -24,7 +24,7 @@
- <rsc_op id="3" operation="stop" operation_key="rhel7-auto4_stop_0" on_node="rhel7-auto2" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <pseudo_event id="26" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="5" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-recover-no-resources.dot b/pengine/test10/remote-recover-no-resources.dot
-index 1e16221..8c2f783 100644
---- a/pengine/test10/remote-recover-no-resources.dot
-+++ b/pengine/test10/remote-recover-no-resources.dot
-@@ -1,4 +1,5 @@
- digraph "g" {
-+"all_stopped" -> "galera-0_start_0 controller-2" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-@@ -98,7 +99,6 @@ digraph "g" {
- "redis_stop_0 controller-1" -> "all_stopped" [ style = bold]
- "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold]
- "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
--"stonith 'reboot' controller-1" -> "galera-0_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold]
-@@ -135,7 +135,6 @@ digraph "g" {
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "galera-0_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
-diff --git a/pengine/test10/remote-recover-no-resources.exp b/pengine/test10/remote-recover-no-resources.exp
-index 987acfd..0a57e27 100644
---- a/pengine/test10/remote-recover-no-resources.exp
-+++ b/pengine/test10/remote-recover-no-resources.exp
-@@ -36,10 +36,10 @@
- </action_set>
- <inputs>
- <trigger>
-- <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0"/>
-+ <pseudo_event id="21" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <pseudo_event id="122" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -49,11 +49,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="4">
- <action_set>
-diff --git a/pengine/test10/remote-recover-no-resources.summary b/pengine/test10/remote-recover-no-resources.summary
-index b682e5f..bed02d0 100644
---- a/pengine/test10/remote-recover-no-resources.summary
-+++ b/pengine/test10/remote-recover-no-resources.summary
-@@ -54,12 +54,12 @@ Transition Summary:
- * Move stonith-fence_ipmilan-5254005bdbb5 ( controller-1 -> controller-2 )
-
- Executing cluster transition:
-+ * Pseudo action: galera-0_stop_0
- * Pseudo action: redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
- * Pseudo action: stonith-fence_ipmilan-5254005bdbb5_stop_0
- * Fencing controller-1 (reboot)
-- * Pseudo action: galera-0_stop_0
- * Pseudo action: galera-2_stop_0
- * Pseudo action: redis_post_notify_stop_0
- * Resource action: redis notify on controller-0
-@@ -69,15 +69,12 @@ Executing cluster transition:
- * Pseudo action: haproxy-clone_stop_0
- * Fencing messaging-1 (reboot)
- * Pseudo action: stonith_complete
-- * Resource action: galera-0 start on controller-2
- * Pseudo action: rabbitmq_post_notify_stop_0
- * Pseudo action: rabbitmq-clone_stop_0
-- * Resource action: galera monitor=10000 on galera-0
- * Pseudo action: redis_stop_0
- * Pseudo action: redis-master_stopped_0
- * Pseudo action: haproxy_stop_0
- * Pseudo action: haproxy-clone_stopped_0
-- * Resource action: galera-0 monitor=20000 on controller-2
- * Resource action: rabbitmq notify on messaging-2
- * Resource action: rabbitmq notify on messaging-0
- * Pseudo action: rabbitmq_notified_0
-@@ -99,11 +96,14 @@ Executing cluster transition:
- * Resource action: ip-172.17.1.17 monitor=10000 on controller-2
- * Resource action: ip-172.17.4.11 monitor=10000 on controller-2
- * Pseudo action: all_stopped
-+ * Resource action: galera-0 start on controller-2
-+ * Resource action: galera monitor=10000 on galera-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
-+ * Resource action: galera-0 monitor=20000 on controller-2
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2
- Using the original execution date of: 2017-05-03 13:33:24Z
-
-diff --git a/pengine/test10/remote-recover-unknown.dot b/pengine/test10/remote-recover-unknown.dot
-index a8b4e18..8ce59b4 100644
---- a/pengine/test10/remote-recover-unknown.dot
-+++ b/pengine/test10/remote-recover-unknown.dot
-@@ -1,4 +1,5 @@
- digraph "g" {
-+"all_stopped" -> "galera-0_start_0 controller-2" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
- "all_stopped" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-@@ -99,7 +100,6 @@ digraph "g" {
- "redis_stop_0 controller-1" -> "all_stopped" [ style = bold]
- "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold]
- "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
--"stonith 'reboot' controller-1" -> "galera-0_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold]
-@@ -138,7 +138,6 @@ digraph "g" {
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "galera-0_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
-diff --git a/pengine/test10/remote-recover-unknown.exp b/pengine/test10/remote-recover-unknown.exp
-index b8d51be..0d7b318 100644
---- a/pengine/test10/remote-recover-unknown.exp
-+++ b/pengine/test10/remote-recover-unknown.exp
-@@ -36,10 +36,10 @@
- </action_set>
- <inputs>
- <trigger>
-- <pseudo_event id="30" operation="stop" operation_key="galera-0_stop_0"/>
-+ <pseudo_event id="21" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <pseudo_event id="123" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="30" operation="stop" operation_key="galera-0_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -49,11 +49,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="4">
- <action_set>
-diff --git a/pengine/test10/remote-recover-unknown.summary b/pengine/test10/remote-recover-unknown.summary
-index 09f10d8..d47f174 100644
---- a/pengine/test10/remote-recover-unknown.summary
-+++ b/pengine/test10/remote-recover-unknown.summary
-@@ -55,12 +55,12 @@ Transition Summary:
- * Move stonith-fence_ipmilan-5254005bdbb5 ( controller-1 -> controller-2 )
-
- Executing cluster transition:
-+ * Pseudo action: galera-0_stop_0
- * Pseudo action: redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
- * Pseudo action: stonith-fence_ipmilan-5254005bdbb5_stop_0
- * Fencing controller-1 (reboot)
-- * Pseudo action: galera-0_stop_0
- * Pseudo action: galera-2_stop_0
- * Pseudo action: redis_post_notify_stop_0
- * Resource action: redis notify on controller-0
-@@ -71,15 +71,12 @@ Executing cluster transition:
- * Fencing galera-2 (reboot)
- * Fencing messaging-1 (reboot)
- * Pseudo action: stonith_complete
-- * Resource action: galera-0 start on controller-2
- * Pseudo action: rabbitmq_post_notify_stop_0
- * Pseudo action: rabbitmq-clone_stop_0
-- * Resource action: galera monitor=10000 on galera-0
- * Pseudo action: redis_stop_0
- * Pseudo action: redis-master_stopped_0
- * Pseudo action: haproxy_stop_0
- * Pseudo action: haproxy-clone_stopped_0
-- * Resource action: galera-0 monitor=20000 on controller-2
- * Resource action: rabbitmq notify on messaging-2
- * Resource action: rabbitmq notify on messaging-0
- * Pseudo action: rabbitmq_notified_0
-@@ -101,11 +98,14 @@ Executing cluster transition:
- * Resource action: ip-172.17.1.17 monitor=10000 on controller-2
- * Resource action: ip-172.17.4.11 monitor=10000 on controller-2
- * Pseudo action: all_stopped
-+ * Resource action: galera-0 start on controller-2
-+ * Resource action: galera monitor=10000 on galera-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
-+ * Resource action: galera-0 monitor=20000 on controller-2
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2
- Using the original execution date of: 2017-05-03 13:33:24Z
-
-diff --git a/pengine/test10/remote-recovery.dot b/pengine/test10/remote-recovery.dot
-index d6fdefe..6cd342f 100644
---- a/pengine/test10/remote-recovery.dot
-+++ b/pengine/test10/remote-recovery.dot
-@@ -89,14 +89,11 @@ digraph "g" {
- "redis_stop_0 controller-1" -> "all_stopped" [ style = bold]
- "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold]
- "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
--"stonith 'reboot' controller-1" -> "galera-0_stop_0 controller-1" [ style = bold]
--"stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold]
--"stonith 'reboot' controller-1" -> "messaging-1_stop_0 controller-1" [ style = bold]
- "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "redis_post_notify_stonith_0" [ style = bold]
- "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold]
-@@ -121,11 +118,8 @@ digraph "g" {
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
- "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "galera-0_start_0 controller-2" [ style = bold]
--"stonith_complete" -> "galera-2_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold]
- "stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
--"stonith_complete" -> "messaging-1_start_0 controller-2" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/remote-recovery.exp b/pengine/test10/remote-recovery.exp
-index cf74efb..40338b4 100644
---- a/pengine/test10/remote-recovery.exp
-+++ b/pengine/test10/remote-recovery.exp
-@@ -23,9 +23,6 @@
- <trigger>
- <pseudo_event id="27" operation="stop" operation_key="messaging-1_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="132" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="2">
-@@ -34,11 +31,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="3">
- <action_set>
-@@ -64,9 +57,6 @@
- <trigger>
- <pseudo_event id="32" operation="stop" operation_key="galera-0_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="132" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="5">
-@@ -75,11 +65,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="6">
- <action_set>
-@@ -105,9 +91,6 @@
- <trigger>
- <pseudo_event id="37" operation="stop" operation_key="galera-2_stop_0"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="132" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="8">
-@@ -116,11 +99,7 @@
- <attributes CRM_meta_name="stop" CRM_meta_timeout="60000" reconnect_interval="60"/>
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="9">
- <action_set>
-diff --git a/pengine/test10/remote-recovery.summary b/pengine/test10/remote-recovery.summary
-index b0433fe..8246cd9 100644
---- a/pengine/test10/remote-recovery.summary
-+++ b/pengine/test10/remote-recovery.summary
-@@ -52,6 +52,9 @@ Transition Summary:
- * Move stonith-fence_ipmilan-5254005bdbb5 ( controller-1 -> controller-2 )
-
- Executing cluster transition:
-+ * Pseudo action: messaging-1_stop_0
-+ * Pseudo action: galera-0_stop_0
-+ * Pseudo action: galera-2_stop_0
- * Pseudo action: redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
-@@ -61,9 +64,12 @@ Executing cluster transition:
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
- * Pseudo action: stonith-fence_ipmilan-5254005bdbb5_stop_0
- * Fencing controller-1 (reboot)
-- * Pseudo action: messaging-1_stop_0
-- * Pseudo action: galera-0_stop_0
-- * Pseudo action: galera-2_stop_0
-+ * Resource action: messaging-1 start on controller-2
-+ * Resource action: galera-0 start on controller-2
-+ * Resource action: galera-2 start on controller-2
-+ * Resource action: rabbitmq monitor=10000 on messaging-1
-+ * Resource action: galera monitor=10000 on galera-2
-+ * Resource action: galera monitor=10000 on galera-0
- * Pseudo action: redis_post_notify_stop_0
- * Resource action: redis notify on controller-0
- * Resource action: redis notify on controller-2
-@@ -72,20 +78,14 @@ Executing cluster transition:
- * Pseudo action: haproxy-clone_stop_0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
- * Pseudo action: stonith_complete
-- * Resource action: messaging-1 start on controller-2
-- * Resource action: galera-0 start on controller-2
-- * Resource action: galera-2 start on controller-2
-- * Resource action: rabbitmq monitor=10000 on messaging-1
-- * Resource action: galera monitor=10000 on galera-2
-- * Resource action: galera monitor=10000 on galera-0
-+ * Resource action: messaging-1 monitor=20000 on controller-2
-+ * Resource action: galera-0 monitor=20000 on controller-2
-+ * Resource action: galera-2 monitor=20000 on controller-2
- * Pseudo action: redis_stop_0
- * Pseudo action: redis-master_stopped_0
- * Pseudo action: haproxy_stop_0
- * Pseudo action: haproxy-clone_stopped_0
- * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2
-- * Resource action: messaging-1 monitor=20000 on controller-2
-- * Resource action: galera-0 monitor=20000 on controller-2
-- * Resource action: galera-2 monitor=20000 on controller-2
- * Pseudo action: redis-master_post_notify_stopped_0
- * Pseudo action: ip-172.17.1.14_stop_0
- * Pseudo action: ip-172.17.1.17_stop_0
-diff --git a/pengine/test10/remote-unclean2.dot b/pengine/test10/remote-unclean2.dot
-index 3f8981b..2311a72 100644
---- a/pengine/test10/remote-unclean2.dot
-+++ b/pengine/test10/remote-unclean2.dot
-@@ -1,4 +1,5 @@
- digraph "g" {
-+"all_stopped" -> "rhel7-auto4_start_0 rhel7-auto1" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "rhel7-auto4_monitor_60000 rhel7-auto1" [ style=bold color="green" fontcolor="black"]
- "rhel7-auto4_start_0 rhel7-auto1" -> "rhel7-auto4_monitor_60000 rhel7-auto1" [ style = bold]
-@@ -9,6 +10,5 @@
- "stonith 'reboot' rhel7-auto4" -> "stonith_complete" [ style = bold]
- "stonith 'reboot' rhel7-auto4" [ style=bold color="green" fontcolor="black"]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "rhel7-auto4_start_0 rhel7-auto1" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/remote-unclean2.exp b/pengine/test10/remote-unclean2.exp
-index ca0b3ba..2c73d82 100644
---- a/pengine/test10/remote-unclean2.exp
-+++ b/pengine/test10/remote-unclean2.exp
-@@ -11,7 +11,7 @@
- <rsc_op id="3" operation="stop" operation_key="rhel7-auto4_stop_0" on_node="rhel7-auto1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <pseudo_event id="9" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="5" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/whitebox-fail1.dot b/pengine/test10/whitebox-fail1.dot
-index bfff4bf..9b755f9 100644
---- a/pengine/test10/whitebox-fail1.dot
-+++ b/pengine/test10/whitebox-fail1.dot
-@@ -26,6 +26,7 @@ digraph "g" {
- "M_stop_0 lxc1" -> "M_start_0 lxc1" [ style = bold]
- "M_stop_0 lxc1" -> "all_stopped" [ style = bold]
- "M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
-+"all_stopped" -> "lxc1_start_0 18node2" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "container1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
- "container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
-@@ -55,6 +56,5 @@ digraph "g" {
- "stonith_complete" -> "M_start_0 lxc1" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
- "stonith_complete" -> "container1_start_0 18node2" [ style = bold]
--"stonith_complete" -> "lxc1_start_0 18node2" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/whitebox-fail1.exp b/pengine/test10/whitebox-fail1.exp
-index 901a1e3..1532c6e 100644
---- a/pengine/test10/whitebox-fail1.exp
-+++ b/pengine/test10/whitebox-fail1.exp
-@@ -227,13 +227,13 @@
- </action_set>
- <inputs>
- <trigger>
-- <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
-+ <pseudo_event id="11" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <rsc_op id="44" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
-+ <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <rsc_op id="44" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/whitebox-fail1.summary b/pengine/test10/whitebox-fail1.summary
-index d1f3480..a5b85dd 100644
---- a/pengine/test10/whitebox-fail1.summary
-+++ b/pengine/test10/whitebox-fail1.summary
-@@ -31,17 +31,17 @@ Executing cluster transition:
- * Resource action: container1 start on 18node2
- * Pseudo action: M-clone_stop_0
- * Pseudo action: B_stop_0
-- * Resource action: lxc1 start on 18node2
-- * Resource action: lxc1 monitor=30000 on 18node2
- * Pseudo action: M_stop_0
- * Pseudo action: M-clone_stopped_0
- * Pseudo action: M-clone_start_0
-- * Resource action: B start on lxc1
- * Pseudo action: all_stopped
-+ * Resource action: lxc1 start on 18node2
-+ * Resource action: lxc1 monitor=30000 on 18node2
- * Resource action: M start on lxc1
- * Pseudo action: M-clone_running_0
-- * Resource action: B monitor=10000 on lxc1
-+ * Resource action: B start on lxc1
- * Resource action: M monitor=10000 on lxc1
-+ * Resource action: B monitor=10000 on lxc1
-
- Revised cluster status:
- Online: [ 18node1 18node2 18node3 ]
-diff --git a/pengine/test10/whitebox-fail2.dot b/pengine/test10/whitebox-fail2.dot
-index bfff4bf..9b755f9 100644
---- a/pengine/test10/whitebox-fail2.dot
-+++ b/pengine/test10/whitebox-fail2.dot
-@@ -26,6 +26,7 @@ digraph "g" {
- "M_stop_0 lxc1" -> "M_start_0 lxc1" [ style = bold]
- "M_stop_0 lxc1" -> "all_stopped" [ style = bold]
- "M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
-+"all_stopped" -> "lxc1_start_0 18node2" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "container1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
- "container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
-@@ -55,6 +56,5 @@ digraph "g" {
- "stonith_complete" -> "M_start_0 lxc1" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
- "stonith_complete" -> "container1_start_0 18node2" [ style = bold]
--"stonith_complete" -> "lxc1_start_0 18node2" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/whitebox-fail2.exp b/pengine/test10/whitebox-fail2.exp
-index 901a1e3..1532c6e 100644
---- a/pengine/test10/whitebox-fail2.exp
-+++ b/pengine/test10/whitebox-fail2.exp
-@@ -227,13 +227,13 @@
- </action_set>
- <inputs>
- <trigger>
-- <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
-+ <pseudo_event id="11" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <rsc_op id="44" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
-+ <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <rsc_op id="44" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/whitebox-fail2.summary b/pengine/test10/whitebox-fail2.summary
-index ebf6c51..afee261 100644
---- a/pengine/test10/whitebox-fail2.summary
-+++ b/pengine/test10/whitebox-fail2.summary
-@@ -31,17 +31,17 @@ Executing cluster transition:
- * Resource action: container1 start on 18node2
- * Pseudo action: M-clone_stop_0
- * Pseudo action: B_stop_0
-- * Resource action: lxc1 start on 18node2
-- * Resource action: lxc1 monitor=30000 on 18node2
- * Pseudo action: M_stop_0
- * Pseudo action: M-clone_stopped_0
- * Pseudo action: M-clone_start_0
-- * Resource action: B start on lxc1
- * Pseudo action: all_stopped
-+ * Resource action: lxc1 start on 18node2
-+ * Resource action: lxc1 monitor=30000 on 18node2
- * Resource action: M start on lxc1
- * Pseudo action: M-clone_running_0
-- * Resource action: B monitor=10000 on lxc1
-+ * Resource action: B start on lxc1
- * Resource action: M monitor=10000 on lxc1
-+ * Resource action: B monitor=10000 on lxc1
-
- Revised cluster status:
- Online: [ 18node1 18node2 18node3 ]
-diff --git a/pengine/test10/whitebox-imply-stop-on-fence.dot b/pengine/test10/whitebox-imply-stop-on-fence.dot
-index 7b536ea..1ef3cba 100644
---- a/pengine/test10/whitebox-imply-stop-on-fence.dot
-+++ b/pengine/test10/whitebox-imply-stop-on-fence.dot
-@@ -18,6 +18,8 @@
- "R-lxc-02_kiff-01_stop_0 kiff-01" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
- "R-lxc-02_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
- "all_stopped" -> "fence-kiff-02_start_0 kiff-02" [ style = bold]
-+"all_stopped" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
-+"all_stopped" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "clvmd-clone_stop_0" -> "clvmd-clone_stopped_0" [ style = bold]
- "clvmd-clone_stop_0" -> "clvmd_stop_0 kiff-01" [ style = bold]
-@@ -78,8 +80,6 @@
- "stonith 'reboot' kiff-01" -> "clvmd_stop_0 kiff-01" [ style = bold]
- "stonith 'reboot' kiff-01" -> "dlm-clone_stop_0" [ style = bold]
- "stonith 'reboot' kiff-01" -> "dlm_stop_0 kiff-01" [ style = bold]
--"stonith 'reboot' kiff-01" -> "lxc-01_kiff-01_stop_0 kiff-01" [ style = bold]
--"stonith 'reboot' kiff-01" -> "lxc-02_kiff-01_stop_0 kiff-01" [ style = bold]
- "stonith 'reboot' kiff-01" -> "shared0-clone_stop_0" [ style = bold]
- "stonith 'reboot' kiff-01" -> "shared0_stop_0 kiff-01" [ style = bold]
- "stonith 'reboot' kiff-01" -> "stonith 'reboot' lxc-01_kiff-01" [ style = bold]
-@@ -94,8 +94,6 @@
- "stonith_complete" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
- "stonith_complete" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
- "stonith_complete" -> "all_stopped" [ style = bold]
--"stonith_complete" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
--"stonith_complete" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
- "stonith_complete" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- "vm-fs_monitor_0 lxc-01_kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
-diff --git a/pengine/test10/whitebox-imply-stop-on-fence.exp b/pengine/test10/whitebox-imply-stop-on-fence.exp
-index f80dde1..c73d1d2 100644
---- a/pengine/test10/whitebox-imply-stop-on-fence.exp
-+++ b/pengine/test10/whitebox-imply-stop-on-fence.exp
-@@ -421,13 +421,13 @@
- </action_set>
- <inputs>
- <trigger>
-- <rsc_op id="46" operation="start" operation_key="R-lxc-01_kiff-01_start_0" on_node="kiff-02" on_node_uuid="2"/>
-+ <pseudo_event id="10" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <pseudo_event id="58" operation="stop" operation_key="lxc-01_kiff-01_stop_0"/>
-+ <rsc_op id="46" operation="start" operation_key="R-lxc-01_kiff-01_start_0" on_node="kiff-02" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <pseudo_event id="68" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="58" operation="stop" operation_key="lxc-01_kiff-01_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -437,11 +437,7 @@
- <attributes CRM_meta_container="R-lxc-01_kiff-01" CRM_meta_timeout="20000" />
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-kiff-01-reboot" on_node="kiff-01" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="32">
- <action_set>
-@@ -465,13 +461,13 @@
- </action_set>
- <inputs>
- <trigger>
-- <rsc_op id="49" operation="start" operation_key="R-lxc-02_kiff-01_start_0" on_node="kiff-02" on_node_uuid="2"/>
-+ <pseudo_event id="10" operation="all_stopped" operation_key="all_stopped"/>
- </trigger>
- <trigger>
-- <pseudo_event id="61" operation="stop" operation_key="lxc-02_kiff-01_stop_0"/>
-+ <rsc_op id="49" operation="start" operation_key="R-lxc-02_kiff-01_start_0" on_node="kiff-02" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <pseudo_event id="68" operation="stonith_complete" operation_key="stonith_complete"/>
-+ <pseudo_event id="61" operation="stop" operation_key="lxc-02_kiff-01_stop_0"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -481,11 +477,7 @@
- <attributes CRM_meta_container="R-lxc-02_kiff-01" CRM_meta_timeout="20000" />
- </pseudo_event>
- </action_set>
-- <inputs>
-- <trigger>
-- <crm_event id="1" operation="stonith" operation_key="stonith-kiff-01-reboot" on_node="kiff-01" on_node_uuid="1"/>
-- </trigger>
-- </inputs>
-+ <inputs/>
- </synapse>
- <synapse id="35">
- <action_set>
-diff --git a/pengine/test10/whitebox-imply-stop-on-fence.summary b/pengine/test10/whitebox-imply-stop-on-fence.summary
-index d272b25..5ce580e 100644
---- a/pengine/test10/whitebox-imply-stop-on-fence.summary
-+++ b/pengine/test10/whitebox-imply-stop-on-fence.summary
-@@ -48,29 +48,23 @@ Executing cluster transition:
- * Resource action: shared0 monitor on lxc-01_kiff-02
- * Resource action: vm-fs monitor on lxc-02_kiff-02
- * Resource action: vm-fs monitor on lxc-01_kiff-02
-- * Fencing kiff-01 (reboot)
- * Pseudo action: lxc-01_kiff-01_stop_0
- * Pseudo action: lxc-02_kiff-01_stop_0
-+ * Fencing kiff-01 (reboot)
-+ * Pseudo action: R-lxc-01_kiff-01_stop_0
-+ * Pseudo action: R-lxc-02_kiff-01_stop_0
- * Pseudo action: stonith-lxc-02_kiff-01-reboot on lxc-02_kiff-01
- * Pseudo action: stonith-lxc-01_kiff-01-reboot on lxc-01_kiff-01
- * Pseudo action: stonith_complete
-- * Pseudo action: R-lxc-01_kiff-01_stop_0
-- * Pseudo action: R-lxc-02_kiff-01_stop_0
-- * Pseudo action: vm-fs_stop_0
- * Pseudo action: shared0-clone_stop_0
- * Resource action: R-lxc-01_kiff-01 start on kiff-02
- * Resource action: R-lxc-02_kiff-01 start on kiff-02
-- * Resource action: lxc-01_kiff-01 start on kiff-02
-- * Resource action: lxc-02_kiff-01 start on kiff-02
-+ * Pseudo action: vm-fs_stop_0
- * Pseudo action: shared0_stop_0
- * Pseudo action: shared0-clone_stopped_0
- * Resource action: R-lxc-01_kiff-01 monitor=10000 on kiff-02
- * Resource action: R-lxc-02_kiff-01 monitor=10000 on kiff-02
-- * Resource action: vm-fs start on lxc-01_kiff-01
-- * Resource action: lxc-01_kiff-01 monitor=30000 on kiff-02
-- * Resource action: lxc-02_kiff-01 monitor=30000 on kiff-02
- * Pseudo action: clvmd-clone_stop_0
-- * Resource action: vm-fs monitor=20000 on lxc-01_kiff-01
- * Pseudo action: clvmd_stop_0
- * Pseudo action: clvmd-clone_stopped_0
- * Pseudo action: dlm-clone_stop_0
-@@ -78,7 +72,13 @@ Executing cluster transition:
- * Pseudo action: dlm-clone_stopped_0
- * Pseudo action: all_stopped
- * Resource action: fence-kiff-02 start on kiff-02
-+ * Resource action: lxc-01_kiff-01 start on kiff-02
-+ * Resource action: lxc-02_kiff-01 start on kiff-02
- * Resource action: fence-kiff-02 monitor=60000 on kiff-02
-+ * Resource action: vm-fs start on lxc-01_kiff-01
-+ * Resource action: lxc-01_kiff-01 monitor=30000 on kiff-02
-+ * Resource action: lxc-02_kiff-01 monitor=30000 on kiff-02
-+ * Resource action: vm-fs monitor=20000 on lxc-01_kiff-01
-
- Revised cluster status:
- Online: [ kiff-02 ]
-diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot
-index 1f4d95b..d5112b9 100644
---- a/pengine/test10/whitebox-ms-ordering.dot
-+++ b/pengine/test10/whitebox-ms-ordering.dot
-@@ -1,4 +1,6 @@
- digraph "g" {
-+"all_stopped" -> "lxc1_start_0 18node1" [ style = bold]
-+"all_stopped" -> "lxc2_start_0 18node1" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "container1_monitor_0 18node1" -> "container1_start_0 18node1" [ style = bold]
- "container1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
-@@ -106,7 +108,5 @@
- "stonith_complete" -> "lxc-ms_promote_0 lxc1" [ style = bold]
- "stonith_complete" -> "lxc-ms_start_0 lxc1" [ style = bold]
- "stonith_complete" -> "lxc-ms_start_0 lxc2" [ style = bold]
--"stonith_complete" -> "lxc1_start_0 18node1" [ style = bold]
--"stonith_complete" -> "lxc2_start_0 18node1" [ style = bold]
- "stonith_complete" [ style=bold color="green" fontcolor="orange"]
- }
-diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp
-index c8fee5e..d5608e4 100644
---- a/pengine/test10/whitebox-ms-ordering.exp
-+++ b/pengine/test10/whitebox-ms-ordering.exp
-@@ -419,6 +419,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-@@ -430,9 +433,6 @@
- <trigger>
- <rsc_op id="20" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="41" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="28">
-@@ -484,6 +484,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="7" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-@@ -495,9 +498,6 @@
- <trigger>
- <rsc_op id="21" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1"/>
- </trigger>
-- <trigger>
-- <pseudo_event id="41" operation="stonith_complete" operation_key="stonith_complete"/>
-- </trigger>
- </inputs>
- </synapse>
- <synapse id="33">
-diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary
-index d8ff62c..46fe9d1 100644
---- a/pengine/test10/whitebox-ms-ordering.summary
-+++ b/pengine/test10/whitebox-ms-ordering.summary
-@@ -43,18 +43,18 @@ Executing cluster transition:
- * Pseudo action: lxc-ms_demote_0
- * Pseudo action: lxc-ms-master_demoted_0
- * Pseudo action: lxc-ms-master_stop_0
-- * Resource action: lxc1 start on 18node1
-- * Resource action: lxc2 start on 18node1
- * Pseudo action: lxc-ms_stop_0
- * Pseudo action: lxc-ms_stop_0
- * Pseudo action: lxc-ms-master_stopped_0
- * Pseudo action: lxc-ms-master_start_0
-- * Resource action: lxc1 monitor=30000 on 18node1
-- * Resource action: lxc2 monitor=30000 on 18node1
- * Pseudo action: all_stopped
-+ * Resource action: lxc1 start on 18node1
-+ * Resource action: lxc2 start on 18node1
- * Resource action: lxc-ms start on lxc1
- * Resource action: lxc-ms start on lxc2
- * Pseudo action: lxc-ms-master_running_0
-+ * Resource action: lxc1 monitor=30000 on 18node1
-+ * Resource action: lxc2 monitor=30000 on 18node1
- * Resource action: lxc-ms monitor=10000 on lxc2
- * Pseudo action: lxc-ms-master_promote_0
- * Resource action: lxc-ms promote on lxc1
-diff --git a/pengine/test10/whitebox-unexpectedly-running.dot b/pengine/test10/whitebox-unexpectedly-running.dot
-index fa1171e..f16e705 100644
---- a/pengine/test10/whitebox-unexpectedly-running.dot
-+++ b/pengine/test10/whitebox-unexpectedly-running.dot
-@@ -8,6 +8,8 @@
- "FAKE-crashed_stop_0 18builder" -> "stonith 'reboot' remote2" [ style = bold]
- "FAKE-crashed_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
- "FAKE_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
-+"all_stopped" -> "remote1_start_0 18builder" [ style = bold]
-+"all_stopped" -> "remote2_start_0 18builder" [ style = bold]
- "all_stopped" [ style=bold color="green" fontcolor="orange"]
- "remote1_monitor_0 18builder" -> "remote1_start_0 18builder" [ style = bold]
- "remote1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
-diff --git a/pengine/test10/whitebox-unexpectedly-running.exp b/pengine/test10/whitebox-unexpectedly-running.exp
-index c4e13b9..46376a5 100644
---- a/pengine/test10/whitebox-unexpectedly-running.exp
-+++ b/pengine/test10/whitebox-unexpectedly-running.exp
-@@ -65,6 +65,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="3" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5"/>
- </trigger>
- </inputs>
-@@ -100,6 +103,9 @@
- </action_set>
- <inputs>
- <trigger>
-+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
-+ </trigger>
-+ <trigger>
- <rsc_op id="4" operation="monitor" operation_key="remote2_monitor_0" on_node="18builder" on_node_uuid="5"/>
- </trigger>
- <trigger>
---
-1.8.3.1
-
-
-From b04b392925daa70af17f2abdef9a6198127c5608 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Fri, 8 Dec 2017 13:53:36 +1100
-Subject: [PATCH 11/16] Fix: PE: Ensure stop operations occur after stopped
- remote connections have been brought up
-
----
- pengine/allocate.c | 55 +++++++++++++++++++++++++++++++++++++++---------------
- 1 file changed, 40 insertions(+), 15 deletions(-)
-
-diff --git a/pengine/allocate.c b/pengine/allocate.c
-index 2ae491c..1c95e97 100644
---- a/pengine/allocate.c
-+++ b/pengine/allocate.c
-@@ -48,6 +48,25 @@ enum remote_connection_state {
- remote_state_stopped = 4
- };
-
-+static const char *
-+state2text(enum remote_connection_state state)
-+{
-+ switch (state) {
-+ case remote_state_unknown:
-+ return "unknown";
-+ case remote_state_alive:
-+ return "alive";
-+ case remote_state_resting:
-+ return "resting";
-+ case remote_state_failed:
-+ return "failed";
-+ case remote_state_stopped:
-+ return "stopped";
-+ }
-+
-+ return "impossible";
-+}
-+
- resource_alloc_functions_t resource_class_alloc_functions[] = {
- {
- native_merge_weights,
-@@ -2011,10 +2030,10 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- cluster_node = remote_rsc->running_on->data;
- }
-
-- crm_trace("Order %s action %s relative to %s%s (state %d)",
-+ crm_trace("Order %s action %s relative to %s%s (state: %s)",
- action->task, action->uuid,
- is_set(remote_rsc->flags, pe_rsc_failed)? "failed " : "",
-- remote_rsc->id, state);
-+ remote_rsc->id, state2text(state));
-
- if (safe_str_eq(action->task, CRMD_ACTION_MIGRATE)
- || safe_str_eq(action->task, CRMD_ACTION_MIGRATE)) {
-@@ -2042,23 +2061,29 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- /* Handle special case with remote node where stop actions need to be
- * ordered after the connection resource starts somewhere else.
- */
-- if(state == remote_state_resting) {
-- /* Wait for the connection resource to be up and assume everything is as we left it */
-- order_start_then_action(remote_rsc, action, pe_order_none,
-- data_set);
-+ if(state == remote_state_alive) {
-+ order_action_then_stop(action, remote_rsc,
-+ pe_order_implies_first, data_set);
-
-- } else {
-- if(state == remote_state_failed) {
-- /* We would only be here if the resource is
-- * running on the remote node. Since we have no
-- * way to stop it, it is necessary to fence the
-- * node.
-- */
-- pe_fence_node(data_set, action->node, "resources are active and the connection is unrecoverable");
-- }
-+ } else if(state == remote_state_failed) {
-+ /* We would only be here if the resource is
-+ * running on the remote node. Since we have no
-+ * way to stop it, it is necessary to fence the
-+ * node.
-+ */
-+ pe_fence_node(data_set, action->node, "resources are active and the connection is unrecoverable");
-+ order_action_then_stop(action, remote_rsc,
-+ pe_order_implies_first, data_set);
-
-+ } else if(remote_rsc->next_role == RSC_ROLE_STOPPED) {
-+ /* If its not coming back up, better do what we need first */
- order_action_then_stop(action, remote_rsc,
- pe_order_implies_first, data_set);
-+
-+ } else {
-+ /* Wait for the connection resource to be up and assume everything is as we left it */
-+ order_start_then_action(remote_rsc, action, pe_order_none, data_set);
-+
- }
- break;
-
---
-1.8.3.1
-
-
-From 502770c763807bc7ac19bf2b2fd50d4a0e195df0 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Fri, 8 Dec 2017 13:56:03 +1100
-Subject: [PATCH 12/16] Test: PE: Ensure stop operations occur after stopped
- remote connections have been brought up
-
----
- pengine/regression.sh | 1 +
- pengine/test10/bundle-order-stop-on-remote.dot | 307 ++++
- pengine/test10/bundle-order-stop-on-remote.exp | 1607 ++++++++++++++++++++
- pengine/test10/bundle-order-stop-on-remote.scores | 934 ++++++++++++
- pengine/test10/bundle-order-stop-on-remote.summary | 224 +++
- pengine/test10/bundle-order-stop-on-remote.xml | 1165 ++++++++++++++
- 6 files changed, 4238 insertions(+)
- create mode 100644 pengine/test10/bundle-order-stop-on-remote.dot
- create mode 100644 pengine/test10/bundle-order-stop-on-remote.exp
- create mode 100644 pengine/test10/bundle-order-stop-on-remote.scores
- create mode 100644 pengine/test10/bundle-order-stop-on-remote.summary
- create mode 100644 pengine/test10/bundle-order-stop-on-remote.xml
-
-diff --git a/pengine/regression.sh b/pengine/regression.sh
-index 47cf0ba..cf1824a 100755
---- a/pengine/regression.sh
-+++ b/pengine/regression.sh
-@@ -819,6 +819,7 @@ do_test bundle-order-partial-start "Bundle startup ordering when some dependanci
- do_test bundle-order-partial-start-2 "Bundle startup ordering when some dependancies and the container are already running"
- do_test bundle-order-stop "Bundle stop ordering"
- do_test bundle-order-partial-stop "Bundle startup ordering when some dependancies are already stopped"
-+do_test bundle-order-stop-on-remote "Stop nested resource after bringing up the connection"
-
- do_test bundle-order-startup-clone "Prevent startup because bundle isn't promoted"
- do_test bundle-order-startup-clone-2 "Bundle startup with clones"
-diff --git a/pengine/test10/bundle-order-stop-on-remote.dot b/pengine/test10/bundle-order-stop-on-remote.dot
-new file mode 100644
-index 0000000..f0b6336
---- /dev/null
-+++ b/pengine/test10/bundle-order-stop-on-remote.dot
-@@ -0,0 +1,307 @@
-+digraph "g" {
-+"all_stopped" [ style=bold color="green" fontcolor="orange"]
-+"database-0_monitor_20000 controller-0" [ style=bold color="green" fontcolor="black"]
-+"database-0_start_0 controller-0" -> "database-0_monitor_20000 controller-0" [ style = bold]
-+"database-0_start_0 controller-0" -> "galera-bundle-docker-0_monitor_60000 database-0" [ style = bold]
-+"database-0_start_0 controller-0" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold]
-+"database-0_start_0 controller-0" -> "galera-bundle-docker-0_stop_0 database-0" [ style = bold]
-+"database-0_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-+"database-2_monitor_20000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"database-2_start_0 controller-1" -> "database-2_monitor_20000 controller-1" [ style = bold]
-+"database-2_start_0 controller-1" -> "galera-bundle-docker-2_monitor_60000 database-2" [ style = bold]
-+"database-2_start_0 controller-1" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold]
-+"database-2_start_0 controller-1" -> "galera-bundle-docker-2_stop_0 database-2" [ style = bold]
-+"database-2_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-0_monitor_0 controller-1" -> "galera-bundle-0_start_0 controller-0" [ style = bold]
-+"galera-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-0_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-0_start_0 controller-0" -> "galera-bundle-0_monitor_60000 controller-0" [ style = bold]
-+"galera-bundle-0_start_0 controller-0" -> "galera_monitor_10000 galera-bundle-0" [ style = bold]
-+"galera-bundle-0_start_0 controller-0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-0_start_0 controller-0" -> "galera_start_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-0_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-2_monitor_0 controller-1" -> "galera-bundle-2_start_0 controller-1" [ style = bold]
-+"galera-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-2_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-2_start_0 controller-1" -> "galera-bundle-2_monitor_60000 controller-1" [ style = bold]
-+"galera-bundle-2_start_0 controller-1" -> "galera_monitor_10000 galera-bundle-2" [ style = bold]
-+"galera-bundle-2_start_0 controller-1" -> "galera_promote_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-2_start_0 controller-1" -> "galera_start_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-2_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-docker-0_monitor_60000 database-0" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-docker-0_start_0 database-0" -> "galera-bundle-0_monitor_0 controller-1" [ style = bold]
-+"galera-bundle-docker-0_start_0 database-0" -> "galera-bundle-0_start_0 controller-0" [ style = bold]
-+"galera-bundle-docker-0_start_0 database-0" -> "galera-bundle-docker-0_monitor_60000 database-0" [ style = bold]
-+"galera-bundle-docker-0_start_0 database-0" -> "galera-bundle_running_0" [ style = bold]
-+"galera-bundle-docker-0_start_0 database-0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-docker-0_start_0 database-0" -> "galera_start_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-docker-0_start_0 database-0" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-docker-0_stop_0 database-0" -> "all_stopped" [ style = bold]
-+"galera-bundle-docker-0_stop_0 database-0" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold]
-+"galera-bundle-docker-0_stop_0 database-0" -> "galera-bundle_stopped_0" [ style = bold]
-+"galera-bundle-docker-0_stop_0 database-0" -> "stonith 'reboot' galera-bundle-0" [ style = bold]
-+"galera-bundle-docker-0_stop_0 database-0" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-docker-2_monitor_60000 database-2" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-docker-2_start_0 database-2" -> "galera-bundle-2_monitor_0 controller-1" [ style = bold]
-+"galera-bundle-docker-2_start_0 database-2" -> "galera-bundle-2_start_0 controller-1" [ style = bold]
-+"galera-bundle-docker-2_start_0 database-2" -> "galera-bundle-docker-2_monitor_60000 database-2" [ style = bold]
-+"galera-bundle-docker-2_start_0 database-2" -> "galera-bundle_running_0" [ style = bold]
-+"galera-bundle-docker-2_start_0 database-2" -> "galera_promote_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-docker-2_start_0 database-2" -> "galera_start_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-docker-2_start_0 database-2" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-docker-2_stop_0 database-2" -> "all_stopped" [ style = bold]
-+"galera-bundle-docker-2_stop_0 database-2" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold]
-+"galera-bundle-docker-2_stop_0 database-2" -> "galera-bundle_stopped_0" [ style = bold]
-+"galera-bundle-docker-2_stop_0 database-2" -> "stonith 'reboot' galera-bundle-2" [ style = bold]
-+"galera-bundle-docker-2_stop_0 database-2" [ style=bold color="green" fontcolor="black"]
-+"galera-bundle-master_demote_0" -> "galera-bundle-master_demoted_0" [ style = bold]
-+"galera-bundle-master_demote_0" -> "galera_demote_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-master_demote_0" -> "galera_demote_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-master_demote_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_demoted_0" -> "galera-bundle-master_promote_0" [ style = bold]
-+"galera-bundle-master_demoted_0" -> "galera-bundle-master_start_0" [ style = bold]
-+"galera-bundle-master_demoted_0" -> "galera-bundle-master_stop_0" [ style = bold]
-+"galera-bundle-master_demoted_0" -> "galera-bundle_demoted_0" [ style = bold]
-+"galera-bundle-master_demoted_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_promote_0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-master_promote_0" -> "galera_promote_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-master_promote_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_promoted_0" -> "galera-bundle_promoted_0" [ style = bold]
-+"galera-bundle-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_running_0" -> "galera-bundle-master_promote_0" [ style = bold]
-+"galera-bundle-master_running_0" -> "galera-bundle_running_0" [ style = bold]
-+"galera-bundle-master_running_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_start_0" -> "galera-bundle-master_running_0" [ style = bold]
-+"galera-bundle-master_start_0" -> "galera_start_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-master_start_0" -> "galera_start_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-master_start_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_stop_0" -> "galera-bundle-master_stopped_0" [ style = bold]
-+"galera-bundle-master_stop_0" -> "galera_stop_0 galera-bundle-0" [ style = bold]
-+"galera-bundle-master_stop_0" -> "galera_stop_0 galera-bundle-2" [ style = bold]
-+"galera-bundle-master_stop_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle-master_stopped_0" -> "galera-bundle-master_promote_0" [ style = bold]
-+"galera-bundle-master_stopped_0" -> "galera-bundle-master_start_0" [ style = bold]
-+"galera-bundle-master_stopped_0" -> "galera-bundle_stopped_0" [ style = bold]
-+"galera-bundle-master_stopped_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_demote_0" -> "galera-bundle-master_demote_0" [ style = bold]
-+"galera-bundle_demote_0" -> "galera-bundle_demoted_0" [ style = bold]
-+"galera-bundle_demote_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_demoted_0" -> "galera-bundle_promote_0" [ style = bold]
-+"galera-bundle_demoted_0" -> "galera-bundle_start_0" [ style = bold]
-+"galera-bundle_demoted_0" -> "galera-bundle_stop_0" [ style = bold]
-+"galera-bundle_demoted_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_promote_0" -> "galera-bundle-master_promote_0" [ style = bold]
-+"galera-bundle_promote_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_promoted_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_running_0" -> "galera-bundle_promote_0" [ style = bold]
-+"galera-bundle_running_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_start_0" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold]
-+"galera-bundle_start_0" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold]
-+"galera-bundle_start_0" -> "galera-bundle-master_start_0" [ style = bold]
-+"galera-bundle_start_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_stop_0" -> "galera-bundle-docker-0_stop_0 database-0" [ style = bold]
-+"galera-bundle_stop_0" -> "galera-bundle-docker-2_stop_0 database-2" [ style = bold]
-+"galera-bundle_stop_0" -> "galera-bundle-master_stop_0" [ style = bold]
-+"galera-bundle_stop_0" -> "galera_stop_0 galera-bundle-0" [ style = bold]
-+"galera-bundle_stop_0" -> "galera_stop_0 galera-bundle-2" [ style = bold]
-+"galera-bundle_stop_0" [ style=bold color="green" fontcolor="orange"]
-+"galera-bundle_stopped_0" -> "galera-bundle_promote_0" [ style = bold]
-+"galera-bundle_stopped_0" -> "galera-bundle_start_0" [ style = bold]
-+"galera-bundle_stopped_0" [ style=bold color="green" fontcolor="orange"]
-+"galera_demote_0 galera-bundle-0" -> "galera-bundle-master_demoted_0" [ style = bold]
-+"galera_demote_0 galera-bundle-0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
-+"galera_demote_0 galera-bundle-0" -> "galera_stop_0 galera-bundle-0" [ style = bold]
-+"galera_demote_0 galera-bundle-0" [ style=bold color="green" fontcolor="orange"]
-+"galera_demote_0 galera-bundle-2" -> "galera-bundle-master_demoted_0" [ style = bold]
-+"galera_demote_0 galera-bundle-2" -> "galera_promote_0 galera-bundle-2" [ style = bold]
-+"galera_demote_0 galera-bundle-2" -> "galera_stop_0 galera-bundle-2" [ style = bold]
-+"galera_demote_0 galera-bundle-2" [ style=bold color="green" fontcolor="orange"]
-+"galera_monitor_10000 galera-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"galera_monitor_10000 galera-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"galera_promote_0 galera-bundle-0" -> "galera-bundle-master_promoted_0" [ style = bold]
-+"galera_promote_0 galera-bundle-0" -> "galera_monitor_10000 galera-bundle-0" [ style = bold]
-+"galera_promote_0 galera-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"galera_promote_0 galera-bundle-2" -> "galera-bundle-master_promoted_0" [ style = bold]
-+"galera_promote_0 galera-bundle-2" -> "galera_monitor_10000 galera-bundle-2" [ style = bold]
-+"galera_promote_0 galera-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"galera_start_0 galera-bundle-0" -> "galera-bundle-master_running_0" [ style = bold]
-+"galera_start_0 galera-bundle-0" -> "galera_monitor_10000 galera-bundle-0" [ style = bold]
-+"galera_start_0 galera-bundle-0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
-+"galera_start_0 galera-bundle-0" -> "galera_start_0 galera-bundle-2" [ style = bold]
-+"galera_start_0 galera-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"galera_start_0 galera-bundle-2" -> "galera-bundle-master_running_0" [ style = bold]
-+"galera_start_0 galera-bundle-2" -> "galera_monitor_10000 galera-bundle-2" [ style = bold]
-+"galera_start_0 galera-bundle-2" -> "galera_promote_0 galera-bundle-2" [ style = bold]
-+"galera_start_0 galera-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"galera_stop_0 galera-bundle-0" -> "all_stopped" [ style = bold]
-+"galera_stop_0 galera-bundle-0" -> "galera-bundle-master_stopped_0" [ style = bold]
-+"galera_stop_0 galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = bold]
-+"galera_stop_0 galera-bundle-0" [ style=bold color="green" fontcolor="orange"]
-+"galera_stop_0 galera-bundle-2" -> "all_stopped" [ style = bold]
-+"galera_stop_0 galera-bundle-2" -> "galera-bundle-master_stopped_0" [ style = bold]
-+"galera_stop_0 galera-bundle-2" -> "galera_start_0 galera-bundle-2" [ style = bold]
-+"galera_stop_0 galera-bundle-2" -> "galera_stop_0 galera-bundle-0" [ style = bold]
-+"galera_stop_0 galera-bundle-2" [ style=bold color="green" fontcolor="orange"]
-+"haproxy-bundle-docker-1_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"haproxy-bundle-docker-1_start_0 controller-1" -> "haproxy-bundle-docker-1_monitor_60000 controller-1" [ style = bold]
-+"haproxy-bundle-docker-1_start_0 controller-1" -> "haproxy-bundle_running_0" [ style = bold]
-+"haproxy-bundle-docker-1_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"haproxy-bundle_running_0" [ style=bold color="green" fontcolor="orange"]
-+"haproxy-bundle_start_0" -> "haproxy-bundle-docker-1_start_0 controller-1" [ style = bold]
-+"haproxy-bundle_start_0" [ style=bold color="green" fontcolor="orange"]
-+"ip-10.0.0.104_monitor_10000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"ip-10.0.0.104_start_0 controller-1" -> "haproxy-bundle_start_0" [ style = bold]
-+"ip-10.0.0.104_start_0 controller-1" -> "ip-10.0.0.104_monitor_10000 controller-1" [ style = bold]
-+"ip-10.0.0.104_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"ip-172.17.1.11_monitor_10000 controller-0" [ style=bold color="green" fontcolor="black"]
-+"ip-172.17.1.11_start_0 controller-0" -> "haproxy-bundle_start_0" [ style = bold]
-+"ip-172.17.1.11_start_0 controller-0" -> "ip-172.17.1.11_monitor_10000 controller-0" [ style = bold]
-+"ip-172.17.1.11_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-+"ip-172.17.3.13_monitor_10000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"ip-172.17.3.13_start_0 controller-1" -> "haproxy-bundle_start_0" [ style = bold]
-+"ip-172.17.3.13_start_0 controller-1" -> "ip-172.17.3.13_monitor_10000 controller-1" [ style = bold]
-+"ip-172.17.3.13_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"ip-192.168.24.11_monitor_10000 controller-0" [ style=bold color="green" fontcolor="black"]
-+"ip-192.168.24.11_start_0 controller-0" -> "haproxy-bundle_start_0" [ style = bold]
-+"ip-192.168.24.11_start_0 controller-0" -> "ip-192.168.24.11_monitor_10000 controller-0" [ style = bold]
-+"ip-192.168.24.11_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-+"openstack-cinder-volume_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-+"openstack-cinder-volume_start_0 controller-0" -> "openstack-cinder-volume_monitor_60000 controller-0" [ style = bold]
-+"openstack-cinder-volume_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-+"redis-bundle-1_monitor_0 controller-1" -> "redis-bundle-1_start_0 controller-1" [ style = bold]
-+"redis-bundle-1_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"redis-bundle-1_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"redis-bundle-1_start_0 controller-1" -> "redis-bundle-1_monitor_60000 controller-1" [ style = bold]
-+"redis-bundle-1_start_0 controller-1" -> "redis:1_monitor_45000 redis-bundle-1" [ style = bold]
-+"redis-bundle-1_start_0 controller-1" -> "redis:1_monitor_60000 redis-bundle-1" [ style = bold]
-+"redis-bundle-1_start_0 controller-1" -> "redis:1_start_0 redis-bundle-1" [ style = bold]
-+"redis-bundle-1_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"redis-bundle-docker-1_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"redis-bundle-docker-1_start_0 controller-1" -> "redis-bundle-1_monitor_0 controller-1" [ style = bold]
-+"redis-bundle-docker-1_start_0 controller-1" -> "redis-bundle-1_start_0 controller-1" [ style = bold]
-+"redis-bundle-docker-1_start_0 controller-1" -> "redis-bundle-docker-1_monitor_60000 controller-1" [ style = bold]
-+"redis-bundle-docker-1_start_0 controller-1" -> "redis-bundle_running_0" [ style = bold]
-+"redis-bundle-docker-1_start_0 controller-1" -> "redis:1_start_0 redis-bundle-1" [ style = bold]
-+"redis-bundle-docker-1_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"redis-bundle-master_confirmed-post_notify_promoted_0" -> "redis-bundle_promoted_0" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_promoted_0" -> "redis:1_monitor_45000 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_promoted_0" -> "redis:1_monitor_60000 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_promoted_0" -> "redis_monitor_20000 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle_running_0" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_running_0" -> "redis:1_monitor_45000 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_running_0" -> "redis:1_monitor_60000 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_20000 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_confirmed-pre_notify_promote_0" -> "redis-bundle-master_post_notify_promoted_0" [ style = bold]
-+"redis-bundle-master_confirmed-pre_notify_promote_0" -> "redis-bundle-master_promote_0" [ style = bold]
-+"redis-bundle-master_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_confirmed-pre_notify_start_0" -> "redis-bundle-master_post_notify_running_0" [ style = bold]
-+"redis-bundle-master_confirmed-pre_notify_start_0" -> "redis-bundle-master_start_0" [ style = bold]
-+"redis-bundle-master_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_post_notify_promoted_0" -> "redis-bundle-master_confirmed-post_notify_promoted_0" [ style = bold]
-+"redis-bundle-master_post_notify_promoted_0" -> "redis:1_post_notify_promote_0 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_post_notify_promoted_0" -> "redis_post_notify_promoted_0 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_post_notify_promoted_0" -> "redis_post_notify_promoted_0 redis-bundle-2" [ style = bold]
-+"redis-bundle-master_post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_post_notify_running_0" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
-+"redis-bundle-master_post_notify_running_0" -> "redis:1_post_notify_start_0 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-2" [ style = bold]
-+"redis-bundle-master_post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_pre_notify_promote_0" -> "redis-bundle-master_confirmed-pre_notify_promote_0" [ style = bold]
-+"redis-bundle-master_pre_notify_promote_0" -> "redis:1_pre_notify_promote_0 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_pre_notify_promote_0" -> "redis_pre_notify_promote_0 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_pre_notify_promote_0" -> "redis_pre_notify_promote_0 redis-bundle-2" [ style = bold]
-+"redis-bundle-master_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_pre_notify_start_0" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold]
-+"redis-bundle-master_pre_notify_start_0" -> "redis_pre_notify_start_0 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_pre_notify_start_0" -> "redis_pre_notify_start_0 redis-bundle-2" [ style = bold]
-+"redis-bundle-master_pre_notify_start_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_promote_0" -> "redis_promote_0 redis-bundle-0" [ style = bold]
-+"redis-bundle-master_promote_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_promoted_0" -> "redis-bundle-master_post_notify_promoted_0" [ style = bold]
-+"redis-bundle-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_running_0" -> "redis-bundle-master_post_notify_running_0" [ style = bold]
-+"redis-bundle-master_running_0" -> "redis-bundle-master_promote_0" [ style = bold]
-+"redis-bundle-master_running_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle-master_start_0" -> "redis-bundle-master_running_0" [ style = bold]
-+"redis-bundle-master_start_0" -> "redis:1_start_0 redis-bundle-1" [ style = bold]
-+"redis-bundle-master_start_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle_promote_0" -> "redis-bundle-master_promote_0" [ style = bold]
-+"redis-bundle_promote_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle_promoted_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle_running_0" -> "redis-bundle_promote_0" [ style = bold]
-+"redis-bundle_running_0" [ style=bold color="green" fontcolor="orange"]
-+"redis-bundle_start_0" -> "redis-bundle-docker-1_start_0 controller-1" [ style = bold]
-+"redis-bundle_start_0" -> "redis-bundle-master_start_0" [ style = bold]
-+"redis-bundle_start_0" [ style=bold color="green" fontcolor="orange"]
-+"redis:1_monitor_45000 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-+"redis:1_monitor_60000 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-+"redis:1_post_notify_promote_0 redis-bundle-1" -> "redis-bundle-master_confirmed-post_notify_promoted_0" [ style = bold]
-+"redis:1_post_notify_promote_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-+"redis:1_post_notify_start_0 redis-bundle-1" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
-+"redis:1_post_notify_start_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-+"redis:1_pre_notify_promote_0 redis-bundle-1" -> "redis-bundle-master_confirmed-pre_notify_promote_0" [ style = bold]
-+"redis:1_pre_notify_promote_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-+"redis:1_start_0 redis-bundle-1" -> "redis-bundle-master_running_0" [ style = bold]
-+"redis:1_start_0 redis-bundle-1" -> "redis:1_monitor_45000 redis-bundle-1" [ style = bold]
-+"redis:1_start_0 redis-bundle-1" -> "redis:1_monitor_60000 redis-bundle-1" [ style = bold]
-+"redis:1_start_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-+"redis_monitor_20000 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"redis_post_notify_promoted_0 redis-bundle-0" -> "redis-bundle-master_confirmed-post_notify_promoted_0" [ style = bold]
-+"redis_post_notify_promoted_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"redis_post_notify_promoted_0 redis-bundle-2" -> "redis-bundle-master_confirmed-post_notify_promoted_0" [ style = bold]
-+"redis_post_notify_promoted_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"redis_post_notify_running_0 redis-bundle-0" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
-+"redis_post_notify_running_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"redis_post_notify_running_0 redis-bundle-2" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
-+"redis_post_notify_running_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"redis_pre_notify_promote_0 redis-bundle-0" -> "redis-bundle-master_confirmed-pre_notify_promote_0" [ style = bold]
-+"redis_pre_notify_promote_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"redis_pre_notify_promote_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_promote_0" [ style = bold]
-+"redis_pre_notify_promote_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"redis_pre_notify_start_0 redis-bundle-0" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold]
-+"redis_pre_notify_start_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"redis_pre_notify_start_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold]
-+"redis_pre_notify_start_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
-+"redis_promote_0 redis-bundle-0" -> "redis-bundle-master_promoted_0" [ style = bold]
-+"redis_promote_0 redis-bundle-0" -> "redis_monitor_20000 redis-bundle-0" [ style = bold]
-+"redis_promote_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
-+"stonith 'reboot' galera-bundle-0" -> "galera-bundle-master_stop_0" [ style = bold]
-+"stonith 'reboot' galera-bundle-0" -> "stonith_complete" [ style = bold]
-+"stonith 'reboot' galera-bundle-0" [ style=bold color="green" fontcolor="orange"]
-+"stonith 'reboot' galera-bundle-2" -> "galera-bundle-master_stop_0" [ style = bold]
-+"stonith 'reboot' galera-bundle-2" -> "stonith_complete" [ style = bold]
-+"stonith 'reboot' galera-bundle-2" [ style=bold color="green" fontcolor="orange"]
-+"stonith-fence_ipmilan-525400498d34_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-525400498d34_start_0 controller-1" -> "stonith-fence_ipmilan-525400498d34_monitor_60000 controller-1" [ style = bold]
-+"stonith-fence_ipmilan-525400498d34_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-525400542c06_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-525400542c06_start_0 controller-0" -> "stonith-fence_ipmilan-525400542c06_monitor_60000 controller-0" [ style = bold]
-+"stonith-fence_ipmilan-525400542c06_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-5254005ea387_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-5254005ea387_start_0 controller-1" -> "stonith-fence_ipmilan-5254005ea387_monitor_60000 controller-1" [ style = bold]
-+"stonith-fence_ipmilan-5254005ea387_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-525400c709f7_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-+"stonith-fence_ipmilan-525400c709f7_start_0 controller-1" -> "stonith-fence_ipmilan-525400c709f7_monitor_60000 controller-1" [ style = bold]
-+"stonith-fence_ipmilan-525400c709f7_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-+"stonith_complete" -> "all_stopped" [ style = bold]
-+"stonith_complete" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold]
-+"stonith_complete" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold]
-+"stonith_complete" -> "galera_promote_0 galera-bundle-0" [ style = bold]
-+"stonith_complete" -> "galera_promote_0 galera-bundle-2" [ style = bold]
-+"stonith_complete" -> "galera_start_0 galera-bundle-0" [ style = bold]
-+"stonith_complete" -> "galera_start_0 galera-bundle-2" [ style = bold]
-+"stonith_complete" -> "haproxy-bundle-docker-1_start_0 controller-1" [ style = bold]
-+"stonith_complete" -> "ip-10.0.0.104_start_0 controller-1" [ style = bold]
-+"stonith_complete" -> "ip-172.17.1.11_start_0 controller-0" [ style = bold]
-+"stonith_complete" -> "ip-172.17.3.13_start_0 controller-1" [ style = bold]
-+"stonith_complete" -> "ip-192.168.24.11_start_0 controller-0" [ style = bold]
-+"stonith_complete" -> "openstack-cinder-volume_start_0 controller-0" [ style = bold]
-+"stonith_complete" -> "redis-bundle-docker-1_start_0 controller-1" [ style = bold]
-+"stonith_complete" -> "redis:1_start_0 redis-bundle-1" [ style = bold]
-+"stonith_complete" -> "redis_promote_0 redis-bundle-0" [ style = bold]
-+"stonith_complete" [ style=bold color="green" fontcolor="orange"]
-+}
-diff --git a/pengine/test10/bundle-order-stop-on-remote.exp b/pengine/test10/bundle-order-stop-on-remote.exp
-new file mode 100644
-index 0000000..db5386b
---- /dev/null
-+++ b/pengine/test10/bundle-order-stop-on-remote.exp
-@@ -0,0 +1,1607 @@
-+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
-+ <synapse id="0">
-+ <action_set>
-+ <rsc_op id="39" operation="monitor" operation_key="database-0_monitor_20000" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="database-0" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" reconnect_interval="60"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="1">
-+ <action_set>
-+ <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="database-0" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="60000" reconnect_interval="60"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="2">
-+ <action_set>
-+ <rsc_op id="43" operation="monitor" operation_key="database-2_monitor_20000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="database-2" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" reconnect_interval="60"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="3">
-+ <action_set>
-+ <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="database-2" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000" reconnect_interval="60"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="4">
-+ <action_set>
-+ <rsc_op id="110" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:0_monitor_10000" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
-+ <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_op_target_rc="8" CRM_meta_physical_host="database-0" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="109" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="5">
-+ <action_set>
-+ <rsc_op id="109" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
-+ <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_physical_host="database-0" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="120" operation="promote" operation_key="galera-bundle-master_promote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="6">
-+ <action_set>
-+ <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
-+ <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_physical_host="database-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="7">
-+ <action_set>
-+ <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0">
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_physical_host="database-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="8">
-+ <action_set>
-+ <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0">
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_physical_host="database-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="9">
-+ <action_set>
-+ <rsc_op id="115" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:2_monitor_10000" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
-+ <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_op_target_rc="8" CRM_meta_physical_host="database-2" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="114" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="10">
-+ <action_set>
-+ <rsc_op id="114" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
-+ <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_physical_host="database-2" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="120" operation="promote" operation_key="galera-bundle-master_promote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="11">
-+ <action_set>
-+ <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1">
-+ <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_physical_host="database-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="12">
-+ <action_set>
-+ <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0">
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_physical_host="database-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="13">
-+ <action_set>
-+ <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0">
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_physical_host="database-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="14" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="106" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="111" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="15">
-+ <action_set>
-+ <pseudo_event id="122" operation="demote" operation_key="galera-bundle-master_demote_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="126" operation="demote" operation_key="galera-bundle_demote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="16" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="121" operation="promoted" operation_key="galera-bundle-master_promoted_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="109" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="114" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="17">
-+ <action_set>
-+ <pseudo_event id="120" operation="promote" operation_key="galera-bundle-master_promote_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="117" operation="running" operation_key="galera-bundle-master_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="124" operation="promote" operation_key="galera-bundle_promote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="18" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="19">
-+ <action_set>
-+ <pseudo_event id="118" operation="stop" operation_key="galera-bundle-master_stop_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="224" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="225" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="20" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="117" operation="running" operation_key="galera-bundle-master_running_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="108" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="113" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="21">
-+ <action_set>
-+ <pseudo_event id="116" operation="start" operation_key="galera-bundle-master_start_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="22">
-+ <action_set>
-+ <rsc_op id="86" operation="monitor" operation_key="galera-bundle-docker-0_monitor_60000" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
-+ <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="23">
-+ <action_set>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
-+ <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="24">
-+ <action_set>
-+ <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
-+ <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="38" operation="start" operation_key="database-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="25">
-+ <action_set>
-+ <rsc_op id="88" operation="monitor" operation_key="galera-bundle-0_monitor_60000" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="database-0" port="3123"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="26">
-+ <action_set>
-+ <rsc_op id="87" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="database-0" port="3123"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="35" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="27">
-+ <action_set>
-+ <rsc_op id="35" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="database-0" port="3123"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="28">
-+ <action_set>
-+ <rsc_op id="95" operation="monitor" operation_key="galera-bundle-docker-2_monitor_60000" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
-+ <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="database-2" CRM_meta_on_node_uuid="database-2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="29">
-+ <action_set>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
-+ <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_on_node="database-2" CRM_meta_on_node_uuid="database-2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="30">
-+ <action_set>
-+ <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1">
-+ <primitive id="galera-bundle-docker-2" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_on_node="database-2" CRM_meta_on_node_uuid="database-2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-2" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-2:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="42" operation="start" operation_key="database-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="31">
-+ <action_set>
-+ <rsc_op id="97" operation="monitor" operation_key="galera-bundle-2_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="database-2" port="3123"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="32">
-+ <action_set>
-+ <rsc_op id="96" operation="start" operation_key="galera-bundle-2_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="database-2" port="3123"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="36" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="33">
-+ <action_set>
-+ <rsc_op id="36" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="galera-bundle-docker-2" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="database-2" port="3123"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="34" priority="1000000">
-+ <action_set>
-+ <rsc_op id="251" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="35">
-+ <action_set>
-+ <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="36" priority="1000000">
-+ <action_set>
-+ <rsc_op id="242" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="37">
-+ <action_set>
-+ <rsc_op id="241" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="38">
-+ <action_set>
-+ <rsc_op id="147" operation="monitor" operation_key="redis_monitor_20000" internal_operation_key="redis:0_monitor_20000" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="20000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_op_target_rc="8" CRM_meta_physical_host="controller-0" CRM_meta_role="Master" CRM_meta_timeout="60000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="146" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="39">
-+ <action_set>
-+ <rsc_op id="146" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="120000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="165" operation="promote" operation_key="redis-bundle-master_promote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="40" priority="1000000">
-+ <action_set>
-+ <rsc_op id="253" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="41">
-+ <action_set>
-+ <rsc_op id="252" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="42" priority="1000000">
-+ <action_set>
-+ <rsc_op id="243" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="43">
-+ <action_set>
-+ <rsc_op id="152" operation="monitor" operation_key="redis:1_monitor_60000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="60000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_role="Slave" CRM_meta_timeout="60000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="44">
-+ <action_set>
-+ <rsc_op id="151" operation="monitor" operation_key="redis:1_monitor_45000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="45000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="60000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="45">
-+ <action_set>
-+ <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="200000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="153" operation="start" operation_key="redis-bundle-master_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="46" priority="1000000">
-+ <action_set>
-+ <rsc_op id="255" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="47">
-+ <action_set>
-+ <rsc_op id="254" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="48" priority="1000000">
-+ <action_set>
-+ <rsc_op id="245" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="49">
-+ <action_set>
-+ <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
-+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="50" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="251" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="253" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="255" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="51" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="166" operation="promoted" operation_key="redis-bundle-master_promoted_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="52">
-+ <action_set>
-+ <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="252" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="254" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="53">
-+ <action_set>
-+ <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="54" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="166" operation="promoted" operation_key="redis-bundle-master_promoted_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="146" operation="promote" operation_key="redis_promote_0" internal_operation_key="redis:0_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="55">
-+ <action_set>
-+ <pseudo_event id="165" operation="promote" operation_key="redis-bundle-master_promote_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="154" operation="running" operation_key="redis-bundle-master_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="177" operation="promote" operation_key="redis-bundle_promote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="56" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="242" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="243" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="245" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="57" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="154" operation="running" operation_key="redis-bundle-master_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="58">
-+ <action_set>
-+ <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="241" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="59">
-+ <action_set>
-+ <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="60" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="154" operation="running" operation_key="redis-bundle-master_running_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="150" operation="start" operation_key="redis:1_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="153" operation="start" operation_key="redis-bundle-master_start_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="61">
-+ <action_set>
-+ <pseudo_event id="153" operation="start" operation_key="redis-bundle-master_start_0">
-+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="140" operation="start" operation_key="redis-bundle_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="62">
-+ <action_set>
-+ <rsc_op id="133" operation="monitor" operation_key="redis-bundle-docker-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/redis:/var/lib/redis:rw -v /var/log/redis:/var/log/redis:rw -v /var/run/redis:/var/run/redis:rw -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/redis-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="63">
-+ <action_set>
-+ <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="redis-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/redis-bundle-1" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/redis:/var/lib/redis:rw -v /var/log/redis:/var/log/redis:rw -v /var/run/redis:/var/run/redis:rw -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/redis-bundle-1:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="140" operation="start" operation_key="redis-bundle_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="64">
-+ <action_set>
-+ <rsc_op id="135" operation="monitor" operation_key="redis-bundle-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="controller-1" port="3124"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="65">
-+ <action_set>
-+ <rsc_op id="134" operation="start" operation_key="redis-bundle-1_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" addr="controller-1" port="3124"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="37" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="66">
-+ <action_set>
-+ <rsc_op id="37" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-+ <attributes CRM_meta_container="redis-bundle-docker-1" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" addr="controller-1" port="3124"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="67">
-+ <action_set>
-+ <rsc_op id="182" operation="monitor" operation_key="ip-192.168.24.11_monitor_10000" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="ip-192.168.24.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32" ip="192.168.24.11"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="181" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="68">
-+ <action_set>
-+ <rsc_op id="181" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="ip-192.168.24.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32" ip="192.168.24.11"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="69">
-+ <action_set>
-+ <rsc_op id="184" operation="monitor" operation_key="ip-10.0.0.104_monitor_10000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="ip-10.0.0.104" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32" ip="10.0.0.104"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="183" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="70">
-+ <action_set>
-+ <rsc_op id="183" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="ip-10.0.0.104" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32" ip="10.0.0.104"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="71">
-+ <action_set>
-+ <rsc_op id="188" operation="monitor" operation_key="ip-172.17.1.11_monitor_10000" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="ip-172.17.1.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32" ip="172.17.1.11"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="187" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="72">
-+ <action_set>
-+ <rsc_op id="187" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="ip-172.17.1.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" cidr_netmask="32" ip="172.17.1.11"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="73">
-+ <action_set>
-+ <rsc_op id="190" operation="monitor" operation_key="ip-172.17.3.13_monitor_10000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="ip-172.17.3.13" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32" ip="172.17.3.13"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="189" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="74">
-+ <action_set>
-+ <rsc_op id="189" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="ip-172.17.3.13" class="ocf" provider="heartbeat" type="IPaddr2"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" cidr_netmask="32" ip="172.17.3.13"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="75">
-+ <action_set>
-+ <rsc_op id="196" operation="monitor" operation_key="haproxy-bundle-docker-1_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="195" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="76">
-+ <action_set>
-+ <rsc_op id="195" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="haproxy-bundle-docker-1" class="ocf" provider="heartbeat" type="docker"/>
-+ <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="199" operation="start" operation_key="haproxy-bundle_start_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="77">
-+ <action_set>
-+ <rsc_op id="204" operation="monitor" operation_key="openstack-cinder-volume_monitor_60000" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="openstack-cinder-volume" class="systemd" type="openstack-cinder-volume"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="100000" />
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="203" operation="start" operation_key="openstack-cinder-volume_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="78">
-+ <action_set>
-+ <rsc_op id="203" operation="start" operation_key="openstack-cinder-volume_start_0" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="openstack-cinder-volume" class="systemd" type="openstack-cinder-volume"/>
-+ <attributes CRM_meta_name="start" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="200000" />
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="79">
-+ <action_set>
-+ <rsc_op id="210" operation="monitor" operation_key="stonith-fence_ipmilan-525400c709f7_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="stonith-fence_ipmilan-525400c709f7" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6240" lanplus="true" login="admin" passwd="password" pcmk_host_list="messaging-0" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="209" operation="start" operation_key="stonith-fence_ipmilan-525400c709f7_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="80">
-+ <action_set>
-+ <rsc_op id="209" operation="start" operation_key="stonith-fence_ipmilan-525400c709f7_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="stonith-fence_ipmilan-525400c709f7" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6240" lanplus="true" login="admin" passwd="password" pcmk_host_list="messaging-0" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="81">
-+ <action_set>
-+ <rsc_op id="216" operation="monitor" operation_key="stonith-fence_ipmilan-5254005ea387_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="stonith-fence_ipmilan-5254005ea387" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6235" lanplus="true" login="admin" passwd="password" pcmk_host_list="database-0" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="215" operation="start" operation_key="stonith-fence_ipmilan-5254005ea387_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="82">
-+ <action_set>
-+ <rsc_op id="215" operation="start" operation_key="stonith-fence_ipmilan-5254005ea387_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="stonith-fence_ipmilan-5254005ea387" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6235" lanplus="true" login="admin" passwd="password" pcmk_host_list="database-0" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="83">
-+ <action_set>
-+ <rsc_op id="218" operation="monitor" operation_key="stonith-fence_ipmilan-525400542c06_monitor_60000" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="stonith-fence_ipmilan-525400542c06" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6236" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-2" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="217" operation="start" operation_key="stonith-fence_ipmilan-525400542c06_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="84">
-+ <action_set>
-+ <rsc_op id="217" operation="start" operation_key="stonith-fence_ipmilan-525400542c06_start_0" on_node="controller-0" on_node_uuid="1">
-+ <primitive id="stonith-fence_ipmilan-525400542c06" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6236" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-2" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="85">
-+ <action_set>
-+ <rsc_op id="222" operation="monitor" operation_key="stonith-fence_ipmilan-525400498d34_monitor_60000" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="stonith-fence_ipmilan-525400498d34" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6231" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-0" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="221" operation="start" operation_key="stonith-fence_ipmilan-525400498d34_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="86">
-+ <action_set>
-+ <rsc_op id="221" operation="start" operation_key="stonith-fence_ipmilan-525400498d34_start_0" on_node="controller-1" on_node_uuid="2">
-+ <primitive id="stonith-fence_ipmilan-525400498d34" class="stonith" type="fence_ipmilan"/>
-+ <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" ipaddr="172.16.0.8" ipport="6231" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-0" privlvl="administrator"/>
-+ </rsc_op>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="87">
-+ <action_set>
-+ <pseudo_event id="225" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2">
-+ <attributes CRM_meta_on_node="galera-bundle-2" CRM_meta_on_node_uuid="galera-bundle-2" CRM_meta_stonith_action="reboot" />
-+ <downed>
-+ <node id="galera-bundle-2"/>
-+ </downed>
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="88">
-+ <action_set>
-+ <pseudo_event id="224" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0">
-+ <attributes CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_stonith_action="reboot" />
-+ <downed>
-+ <node id="galera-bundle-0"/>
-+ </downed>
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="89">
-+ <action_set>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete">
-+ <attributes />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="224" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="225" operation="stonith" operation_key="stonith-galera-bundle-2-reboot" on_node="galera-bundle-2" on_node_uuid="galera-bundle-2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="90" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="200" operation="running" operation_key="haproxy-bundle_running_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="195" operation="start" operation_key="haproxy-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="91">
-+ <action_set>
-+ <pseudo_event id="199" operation="start" operation_key="haproxy-bundle_start_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="181" operation="start" operation_key="ip-192.168.24.11_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="183" operation="start" operation_key="ip-10.0.0.104_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="187" operation="start" operation_key="ip-172.17.1.11_start_0" on_node="controller-0" on_node_uuid="1"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="189" operation="start" operation_key="ip-172.17.3.13_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="92" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="178" operation="promoted" operation_key="redis-bundle_promoted_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="170" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="93">
-+ <action_set>
-+ <pseudo_event id="177" operation="promote" operation_key="redis-bundle_promote_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="141" operation="running" operation_key="redis-bundle_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="94" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="141" operation="running" operation_key="redis-bundle_running_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="132" operation="start" operation_key="redis-bundle-docker-1_start_0" on_node="controller-1" on_node_uuid="2"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="158" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="95">
-+ <action_set>
-+ <pseudo_event id="140" operation="start" operation_key="redis-bundle_start_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="96" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="123" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="126" operation="demote" operation_key="galera-bundle_demote_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="97">
-+ <action_set>
-+ <pseudo_event id="126" operation="demote" operation_key="galera-bundle_demote_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs/>
-+ </synapse>
-+ <synapse id="98" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="125" operation="promoted" operation_key="galera-bundle_promoted_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="121" operation="promoted" operation_key="galera-bundle-master_promoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="99">
-+ <action_set>
-+ <pseudo_event id="124" operation="promote" operation_key="galera-bundle_promote_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="99" operation="running" operation_key="galera-bundle_running_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="101" operation="stopped" operation_key="galera-bundle_stopped_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="100" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="101" operation="stopped" operation_key="galera-bundle_stopped_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="119" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="101">
-+ <action_set>
-+ <pseudo_event id="100" operation="stop" operation_key="galera-bundle_stop_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="102" priority="1000000">
-+ <action_set>
-+ <pseudo_event id="99" operation="running" operation_key="galera-bundle_running_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="85" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="94" operation="start" operation_key="galera-bundle-docker-2_start_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="117" operation="running" operation_key="galera-bundle-master_running_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="103">
-+ <action_set>
-+ <pseudo_event id="98" operation="start" operation_key="galera-bundle_start_0">
-+ <attributes CRM_meta_timeout="20000" />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <pseudo_event id="101" operation="stopped" operation_key="galera-bundle_stopped_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="127" operation="demoted" operation_key="galera-bundle_demoted_0"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+ <synapse id="104">
-+ <action_set>
-+ <pseudo_event id="34" operation="all_stopped" operation_key="all_stopped">
-+ <attributes />
-+ </pseudo_event>
-+ </action_set>
-+ <inputs>
-+ <trigger>
-+ <rsc_op id="84" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
-+ </trigger>
-+ <trigger>
-+ <rsc_op id="93" operation="stop" operation_key="galera-bundle-docker-2_stop_0" on_node="database-2" on_node_uuid="database-2" router_node="controller-1"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="107" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="112" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0"/>
-+ </trigger>
-+ <trigger>
-+ <pseudo_event id="223" operation="stonith_complete" operation_key="stonith_complete"/>
-+ </trigger>
-+ </inputs>
-+ </synapse>
-+</transition_graph>
-diff --git a/pengine/test10/bundle-order-stop-on-remote.scores b/pengine/test10/bundle-order-stop-on-remote.scores
-new file mode 100644
-index 0000000..e26f511
---- /dev/null
-+++ b/pengine/test10/bundle-order-stop-on-remote.scores
-@@ -0,0 +1,934 @@
-+Allocation scores:
-+clone_color: galera-bundle-master allocation score on controller-0: -INFINITY
-+clone_color: galera-bundle-master allocation score on controller-1: -INFINITY
-+clone_color: galera-bundle-master allocation score on controller-2: -INFINITY
-+clone_color: galera-bundle-master allocation score on database-0: -INFINITY
-+clone_color: galera-bundle-master allocation score on database-1: -INFINITY
-+clone_color: galera-bundle-master allocation score on database-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 messaging-0: -INFINITY
-+clone_color: galera-bundle-master allocation score on messaging-1: -INFINITY
-+clone_color: galera-bundle-master allocation score on messaging-2: -INFINITY
-+clone_color: galera:0 allocation score on galera-bundle-0: INFINITY
-+clone_color: galera:1 allocation score on galera-bundle-1: INFINITY
-+clone_color: galera:2 allocation score on galera-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 database-0: -INFINITY
-+clone_color: rabbitmq-bundle-clone allocation score on database-1: -INFINITY
-+clone_color: rabbitmq-bundle-clone allocation score on database-2: -INFINITY
-+clone_color: rabbitmq-bundle-clone allocation score on messaging-0: -INFINITY
-+clone_color: rabbitmq-bundle-clone allocation score on messaging-1: -INFINITY
-+clone_color: rabbitmq-bundle-clone allocation score on messaging-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 rabbitmq-bundle-0: INFINITY
-+clone_color: rabbitmq:1 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 database-0: -INFINITY
-+clone_color: redis-bundle-master allocation score on database-1: -INFINITY
-+clone_color: redis-bundle-master allocation score on database-2: -INFINITY
-+clone_color: redis-bundle-master allocation score on messaging-0: -INFINITY
-+clone_color: redis-bundle-master allocation score on messaging-1: -INFINITY
-+clone_color: redis-bundle-master allocation score on messaging-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 redis-bundle-0: INFINITY
-+clone_color: redis:1 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: -INFINITY
-+container_color: galera-bundle allocation score on controller-1: -INFINITY
-+container_color: galera-bundle allocation score on controller-2: -INFINITY
-+container_color: galera-bundle allocation score on database-0: 0
-+container_color: galera-bundle allocation score on database-1: 0
-+container_color: galera-bundle allocation score on database-2: 0
-+container_color: galera-bundle allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle allocation score on messaging-2: -INFINITY
-+container_color: galera-bundle-0 allocation score on controller-0: 0
-+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 database-0: -INFINITY
-+container_color: galera-bundle-0 allocation score on database-1: -INFINITY
-+container_color: galera-bundle-0 allocation score on database-2: -INFINITY
-+container_color: galera-bundle-0 allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle-0 allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle-0 allocation score on messaging-2: -INFINITY
-+container_color: galera-bundle-1 allocation score on controller-0: 0
-+container_color: galera-bundle-1 allocation score on controller-1: 0
-+container_color: galera-bundle-1 allocation score on controller-2: INFINITY
-+container_color: galera-bundle-1 allocation score on database-0: -INFINITY
-+container_color: galera-bundle-1 allocation score on database-1: -INFINITY
-+container_color: galera-bundle-1 allocation score on database-2: -INFINITY
-+container_color: galera-bundle-1 allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle-1 allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle-1 allocation score on messaging-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: 0
-+container_color: galera-bundle-2 allocation score on database-0: -INFINITY
-+container_color: galera-bundle-2 allocation score on database-1: -INFINITY
-+container_color: galera-bundle-2 allocation score on database-2: -INFINITY
-+container_color: galera-bundle-2 allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle-2 allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle-2 allocation score on messaging-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: -INFINITY
-+container_color: galera-bundle-docker-0 allocation score on controller-2: -INFINITY
-+container_color: galera-bundle-docker-0 allocation score on database-0: INFINITY
-+container_color: galera-bundle-docker-0 allocation score on database-1: 0
-+container_color: galera-bundle-docker-0 allocation score on database-2: 0
-+container_color: galera-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: galera-bundle-docker-1 allocation score on controller-0: -INFINITY
-+container_color: galera-bundle-docker-1 allocation score on controller-1: -INFINITY
-+container_color: galera-bundle-docker-1 allocation score on controller-2: -INFINITY
-+container_color: galera-bundle-docker-1 allocation score on database-0: 0
-+container_color: galera-bundle-docker-1 allocation score on database-1: INFINITY
-+container_color: galera-bundle-docker-1 allocation score on database-2: 0
-+container_color: galera-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: galera-bundle-docker-2 allocation score on controller-0: -INFINITY
-+container_color: galera-bundle-docker-2 allocation score on controller-1: -INFINITY
-+container_color: galera-bundle-docker-2 allocation score on controller-2: -INFINITY
-+container_color: galera-bundle-docker-2 allocation score on database-0: 0
-+container_color: galera-bundle-docker-2 allocation score on database-1: 0
-+container_color: galera-bundle-docker-2 allocation score on database-2: INFINITY
-+container_color: galera-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: galera-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: galera-bundle-docker-2 allocation score on messaging-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 database-0: 0
-+container_color: galera-bundle-master allocation score on database-1: 0
-+container_color: galera-bundle-master allocation score on database-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 messaging-0: 0
-+container_color: galera-bundle-master allocation score on messaging-1: 0
-+container_color: galera-bundle-master allocation score on messaging-2: 0
-+container_color: galera:0 allocation score on galera-bundle-0: INFINITY
-+container_color: galera:1 allocation score on galera-bundle-1: INFINITY
-+container_color: galera:2 allocation score on galera-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
-+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
-+container_color: haproxy-bundle allocation score on controller-0: 0
-+container_color: haproxy-bundle allocation score on controller-1: 0
-+container_color: haproxy-bundle allocation score on controller-1: 0
-+container_color: haproxy-bundle allocation score on controller-1: 0
-+container_color: haproxy-bundle allocation score on controller-1: 0
-+container_color: haproxy-bundle allocation score on controller-1: 0
-+container_color: haproxy-bundle allocation score on controller-1: 0
-+container_color: haproxy-bundle allocation score on controller-1: 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 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 database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle allocation score on messaging-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
-+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
-+container_color: haproxy-bundle-docker-0 allocation score on controller-0: INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-0 allocation score on controller-1: 0
-+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: -INFINITY
-+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: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on controller-2: 0
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-0 allocation score on messaging-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
-+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
-+container_color: haproxy-bundle-docker-1 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-1 allocation score on controller-1: 0
-+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 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 controller-2: 0
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+container_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+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: INFINITY
-+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: INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on controller-2: INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+container_color: rabbitmq-bundle allocation score on controller-0: -INFINITY
-+container_color: rabbitmq-bundle allocation score on controller-1: -INFINITY
-+container_color: rabbitmq-bundle allocation score on controller-2: -INFINITY
-+container_color: rabbitmq-bundle allocation score on database-0: -INFINITY
-+container_color: rabbitmq-bundle allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle allocation score on messaging-0: 0
-+container_color: rabbitmq-bundle allocation score on messaging-1: 0
-+container_color: rabbitmq-bundle allocation score on messaging-2: 0
-+container_color: rabbitmq-bundle-0 allocation score on controller-0: 0
-+container_color: rabbitmq-bundle-0 allocation score on controller-1: 0
-+container_color: rabbitmq-bundle-0 allocation score on controller-2: INFINITY
-+container_color: rabbitmq-bundle-0 allocation score on database-0: -INFINITY
-+container_color: rabbitmq-bundle-0 allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle-0 allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle-0 allocation score on messaging-0: -INFINITY
-+container_color: rabbitmq-bundle-0 allocation score on messaging-1: -INFINITY
-+container_color: rabbitmq-bundle-0 allocation score on messaging-2: -INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on controller-0: 0
-+container_color: rabbitmq-bundle-1 allocation score on controller-1: 0
-+container_color: rabbitmq-bundle-1 allocation score on controller-2: INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on database-0: -INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on messaging-0: -INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on messaging-1: -INFINITY
-+container_color: rabbitmq-bundle-1 allocation score on messaging-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 database-0: -INFINITY
-+container_color: rabbitmq-bundle-2 allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle-2 allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle-2 allocation score on messaging-0: -INFINITY
-+container_color: rabbitmq-bundle-2 allocation score on messaging-1: -INFINITY
-+container_color: rabbitmq-bundle-2 allocation score on messaging-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 database-0: 0
-+container_color: rabbitmq-bundle-clone allocation score on database-1: 0
-+container_color: rabbitmq-bundle-clone allocation score on database-2: 0
-+container_color: rabbitmq-bundle-clone allocation score on messaging-0: 0
-+container_color: rabbitmq-bundle-clone allocation score on messaging-1: 0
-+container_color: rabbitmq-bundle-clone allocation score on messaging-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: -INFINITY
-+container_color: rabbitmq-bundle-docker-0 allocation score on controller-2: -INFINITY
-+container_color: rabbitmq-bundle-docker-0 allocation score on database-0: -INFINITY
-+container_color: rabbitmq-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle-docker-0 allocation score on messaging-0: INFINITY
-+container_color: rabbitmq-bundle-docker-0 allocation score on messaging-1: 0
-+container_color: rabbitmq-bundle-docker-0 allocation score on messaging-2: 0
-+container_color: rabbitmq-bundle-docker-1 allocation score on controller-0: -INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on controller-1: -INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on controller-2: -INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on messaging-0: 0
-+container_color: rabbitmq-bundle-docker-1 allocation score on messaging-1: INFINITY
-+container_color: rabbitmq-bundle-docker-1 allocation score on messaging-2: 0
-+container_color: rabbitmq-bundle-docker-2 allocation score on controller-0: -INFINITY
-+container_color: rabbitmq-bundle-docker-2 allocation score on controller-1: -INFINITY
-+container_color: rabbitmq-bundle-docker-2 allocation score on controller-2: -INFINITY
-+container_color: rabbitmq-bundle-docker-2 allocation score on database-0: -INFINITY
-+container_color: rabbitmq-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: rabbitmq-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: rabbitmq-bundle-docker-2 allocation score on messaging-0: 0
-+container_color: rabbitmq-bundle-docker-2 allocation score on messaging-1: 0
-+container_color: rabbitmq-bundle-docker-2 allocation score on messaging-2: INFINITY
-+container_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-+container_color: rabbitmq:1 allocation score on rabbitmq-bundle-1: INFINITY
-+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 database-0: -INFINITY
-+container_color: redis-bundle allocation score on database-1: -INFINITY
-+container_color: redis-bundle allocation score on database-2: -INFINITY
-+container_color: redis-bundle allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle allocation score on messaging-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 database-0: -INFINITY
-+container_color: redis-bundle-0 allocation score on database-1: -INFINITY
-+container_color: redis-bundle-0 allocation score on database-2: -INFINITY
-+container_color: redis-bundle-0 allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle-0 allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle-0 allocation score on messaging-2: -INFINITY
-+container_color: redis-bundle-1 allocation score on controller-0: 0
-+container_color: redis-bundle-1 allocation score on controller-1: 0
-+container_color: redis-bundle-1 allocation score on controller-2: 0
-+container_color: redis-bundle-1 allocation score on database-0: -INFINITY
-+container_color: redis-bundle-1 allocation score on database-1: -INFINITY
-+container_color: redis-bundle-1 allocation score on database-2: -INFINITY
-+container_color: redis-bundle-1 allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle-1 allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle-1 allocation score on messaging-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 database-0: -INFINITY
-+container_color: redis-bundle-2 allocation score on database-1: -INFINITY
-+container_color: redis-bundle-2 allocation score on database-2: -INFINITY
-+container_color: redis-bundle-2 allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle-2 allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle-2 allocation score on messaging-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 database-0: -INFINITY
-+container_color: redis-bundle-docker-0 allocation score on database-1: -INFINITY
-+container_color: redis-bundle-docker-0 allocation score on database-2: -INFINITY
-+container_color: redis-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle-docker-0 allocation score on messaging-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: 0
-+container_color: redis-bundle-docker-1 allocation score on controller-2: 0
-+container_color: redis-bundle-docker-1 allocation score on database-0: -INFINITY
-+container_color: redis-bundle-docker-1 allocation score on database-1: -INFINITY
-+container_color: redis-bundle-docker-1 allocation score on database-2: -INFINITY
-+container_color: redis-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle-docker-1 allocation score on messaging-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 database-0: -INFINITY
-+container_color: redis-bundle-docker-2 allocation score on database-1: -INFINITY
-+container_color: redis-bundle-docker-2 allocation score on database-2: -INFINITY
-+container_color: redis-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+container_color: redis-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+container_color: redis-bundle-docker-2 allocation score on messaging-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 database-0: 0
-+container_color: redis-bundle-master allocation score on database-1: 0
-+container_color: redis-bundle-master allocation score on database-2: 0
-+container_color: redis-bundle-master allocation score on messaging-0: 0
-+container_color: redis-bundle-master allocation score on messaging-1: 0
-+container_color: redis-bundle-master allocation score on messaging-2: 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 redis-bundle-0: INFINITY
-+container_color: redis:1 allocation score on redis-bundle-1: 500
-+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
-+galera:2 promotion score on galera-bundle-2: 100
-+native_color: database-0 allocation score on controller-0: 0
-+native_color: database-0 allocation score on controller-1: 0
-+native_color: database-0 allocation score on controller-2: 0
-+native_color: database-0 allocation score on database-0: -INFINITY
-+native_color: database-0 allocation score on database-1: -INFINITY
-+native_color: database-0 allocation score on database-2: -INFINITY
-+native_color: database-0 allocation score on messaging-0: -INFINITY
-+native_color: database-0 allocation score on messaging-1: -INFINITY
-+native_color: database-0 allocation score on messaging-2: -INFINITY
-+native_color: database-1 allocation score on controller-0: 0
-+native_color: database-1 allocation score on controller-1: 0
-+native_color: database-1 allocation score on controller-2: INFINITY
-+native_color: database-1 allocation score on database-0: -INFINITY
-+native_color: database-1 allocation score on database-1: -INFINITY
-+native_color: database-1 allocation score on database-2: -INFINITY
-+native_color: database-1 allocation score on messaging-0: -INFINITY
-+native_color: database-1 allocation score on messaging-1: -INFINITY
-+native_color: database-1 allocation score on messaging-2: -INFINITY
-+native_color: database-2 allocation score on controller-0: 0
-+native_color: database-2 allocation score on controller-1: 0
-+native_color: database-2 allocation score on controller-2: 0
-+native_color: database-2 allocation score on database-0: -INFINITY
-+native_color: database-2 allocation score on database-1: -INFINITY
-+native_color: database-2 allocation score on database-2: -INFINITY
-+native_color: database-2 allocation score on messaging-0: -INFINITY
-+native_color: database-2 allocation score on messaging-1: -INFINITY
-+native_color: database-2 allocation score on messaging-2: -INFINITY
-+native_color: galera-bundle-0 allocation score on controller-0: 0
-+native_color: galera-bundle-0 allocation score on controller-1: -INFINITY
-+native_color: galera-bundle-0 allocation score on controller-2: -INFINITY
-+native_color: galera-bundle-0 allocation score on database-0: -INFINITY
-+native_color: galera-bundle-0 allocation score on database-1: -INFINITY
-+native_color: galera-bundle-0 allocation score on database-2: -INFINITY
-+native_color: galera-bundle-0 allocation score on messaging-0: -INFINITY
-+native_color: galera-bundle-0 allocation score on messaging-1: -INFINITY
-+native_color: galera-bundle-0 allocation score on messaging-2: -INFINITY
-+native_color: galera-bundle-1 allocation score on controller-0: -INFINITY
-+native_color: galera-bundle-1 allocation score on controller-1: -INFINITY
-+native_color: galera-bundle-1 allocation score on controller-2: INFINITY
-+native_color: galera-bundle-1 allocation score on database-0: -INFINITY
-+native_color: galera-bundle-1 allocation score on database-1: -INFINITY
-+native_color: galera-bundle-1 allocation score on database-2: -INFINITY
-+native_color: galera-bundle-1 allocation score on messaging-0: -INFINITY
-+native_color: galera-bundle-1 allocation score on messaging-1: -INFINITY
-+native_color: galera-bundle-1 allocation score on messaging-2: -INFINITY
-+native_color: galera-bundle-2 allocation score on controller-0: -INFINITY
-+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 database-0: -INFINITY
-+native_color: galera-bundle-2 allocation score on database-1: -INFINITY
-+native_color: galera-bundle-2 allocation score on database-2: -INFINITY
-+native_color: galera-bundle-2 allocation score on messaging-0: -INFINITY
-+native_color: galera-bundle-2 allocation score on messaging-1: -INFINITY
-+native_color: galera-bundle-2 allocation score on messaging-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 database-0: INFINITY
-+native_color: galera-bundle-docker-0 allocation score on database-1: -INFINITY
-+native_color: galera-bundle-docker-0 allocation score on database-2: -10000
-+native_color: galera-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+native_color: galera-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+native_color: galera-bundle-docker-0 allocation score on messaging-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: -INFINITY
-+native_color: galera-bundle-docker-1 allocation score on database-0: -10000
-+native_color: galera-bundle-docker-1 allocation score on database-1: INFINITY
-+native_color: galera-bundle-docker-1 allocation score on database-2: -10000
-+native_color: galera-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+native_color: galera-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+native_color: galera-bundle-docker-1 allocation score on messaging-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 database-0: -INFINITY
-+native_color: galera-bundle-docker-2 allocation score on database-1: -INFINITY
-+native_color: galera-bundle-docker-2 allocation score on database-2: INFINITY
-+native_color: galera-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+native_color: galera-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+native_color: galera-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+native_color: galera:0 allocation score on galera-bundle-0: INFINITY
-+native_color: galera:1 allocation score on galera-bundle-1: INFINITY
-+native_color: galera:2 allocation score on galera-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: 0
-+native_color: haproxy-bundle-docker-0 allocation score on controller-2: -INFINITY
-+native_color: haproxy-bundle-docker-0 allocation score on database-0: -INFINITY
-+native_color: haproxy-bundle-docker-0 allocation score on database-1: -INFINITY
-+native_color: haproxy-bundle-docker-0 allocation score on database-2: -INFINITY
-+native_color: haproxy-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+native_color: haproxy-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+native_color: haproxy-bundle-docker-0 allocation score on messaging-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 database-0: -INFINITY
-+native_color: haproxy-bundle-docker-1 allocation score on database-1: -INFINITY
-+native_color: haproxy-bundle-docker-1 allocation score on database-2: -INFINITY
-+native_color: haproxy-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+native_color: haproxy-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+native_color: haproxy-bundle-docker-1 allocation score on messaging-2: -INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on controller-0: 0
-+native_color: haproxy-bundle-docker-2 allocation score on controller-1: 0
-+native_color: haproxy-bundle-docker-2 allocation score on controller-2: INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on database-0: -INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on database-1: -INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on database-2: -INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+native_color: haproxy-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+native_color: ip-10.0.0.104 allocation score on controller-0: 0
-+native_color: ip-10.0.0.104 allocation score on controller-1: 0
-+native_color: ip-10.0.0.104 allocation score on controller-2: 0
-+native_color: ip-10.0.0.104 allocation score on database-0: -INFINITY
-+native_color: ip-10.0.0.104 allocation score on database-1: -INFINITY
-+native_color: ip-10.0.0.104 allocation score on database-2: -INFINITY
-+native_color: ip-10.0.0.104 allocation score on messaging-0: -INFINITY
-+native_color: ip-10.0.0.104 allocation score on messaging-1: -INFINITY
-+native_color: ip-10.0.0.104 allocation score on messaging-2: -INFINITY
-+native_color: ip-172.17.1.11 allocation score on controller-0: 0
-+native_color: ip-172.17.1.11 allocation score on controller-1: 0
-+native_color: ip-172.17.1.11 allocation score on controller-2: 0
-+native_color: ip-172.17.1.11 allocation score on database-0: -INFINITY
-+native_color: ip-172.17.1.11 allocation score on database-1: -INFINITY
-+native_color: ip-172.17.1.11 allocation score on database-2: -INFINITY
-+native_color: ip-172.17.1.11 allocation score on messaging-0: -INFINITY
-+native_color: ip-172.17.1.11 allocation score on messaging-1: -INFINITY
-+native_color: ip-172.17.1.11 allocation score on messaging-2: -INFINITY
-+native_color: ip-172.17.1.19 allocation score on controller-0: 0
-+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 database-0: -INFINITY
-+native_color: ip-172.17.1.19 allocation score on database-1: -INFINITY
-+native_color: ip-172.17.1.19 allocation score on database-2: -INFINITY
-+native_color: ip-172.17.1.19 allocation score on messaging-0: -INFINITY
-+native_color: ip-172.17.1.19 allocation score on messaging-1: -INFINITY
-+native_color: ip-172.17.1.19 allocation score on messaging-2: -INFINITY
-+native_color: ip-172.17.3.13 allocation score on controller-0: 0
-+native_color: ip-172.17.3.13 allocation score on controller-1: 0
-+native_color: ip-172.17.3.13 allocation score on controller-2: 0
-+native_color: ip-172.17.3.13 allocation score on database-0: -INFINITY
-+native_color: ip-172.17.3.13 allocation score on database-1: -INFINITY
-+native_color: ip-172.17.3.13 allocation score on database-2: -INFINITY
-+native_color: ip-172.17.3.13 allocation score on messaging-0: -INFINITY
-+native_color: ip-172.17.3.13 allocation score on messaging-1: -INFINITY
-+native_color: ip-172.17.3.13 allocation score on messaging-2: -INFINITY
-+native_color: ip-172.17.4.19 allocation score on controller-0: 0
-+native_color: ip-172.17.4.19 allocation score on controller-1: 0
-+native_color: ip-172.17.4.19 allocation score on controller-2: INFINITY
-+native_color: ip-172.17.4.19 allocation score on database-0: -INFINITY
-+native_color: ip-172.17.4.19 allocation score on database-1: -INFINITY
-+native_color: ip-172.17.4.19 allocation score on database-2: -INFINITY
-+native_color: ip-172.17.4.19 allocation score on messaging-0: -INFINITY
-+native_color: ip-172.17.4.19 allocation score on messaging-1: -INFINITY
-+native_color: ip-172.17.4.19 allocation score on messaging-2: -INFINITY
-+native_color: ip-192.168.24.11 allocation score on controller-0: 0
-+native_color: ip-192.168.24.11 allocation score on controller-1: 0
-+native_color: ip-192.168.24.11 allocation score on controller-2: 0
-+native_color: ip-192.168.24.11 allocation score on database-0: -INFINITY
-+native_color: ip-192.168.24.11 allocation score on database-1: -INFINITY
-+native_color: ip-192.168.24.11 allocation score on database-2: -INFINITY
-+native_color: ip-192.168.24.11 allocation score on messaging-0: -INFINITY
-+native_color: ip-192.168.24.11 allocation score on messaging-1: -INFINITY
-+native_color: ip-192.168.24.11 allocation score on messaging-2: -INFINITY
-+native_color: messaging-0 allocation score on controller-0: 0
-+native_color: messaging-0 allocation score on controller-1: 0
-+native_color: messaging-0 allocation score on controller-2: INFINITY
-+native_color: messaging-0 allocation score on database-0: -INFINITY
-+native_color: messaging-0 allocation score on database-1: -INFINITY
-+native_color: messaging-0 allocation score on database-2: -INFINITY
-+native_color: messaging-0 allocation score on messaging-0: -INFINITY
-+native_color: messaging-0 allocation score on messaging-1: -INFINITY
-+native_color: messaging-0 allocation score on messaging-2: -INFINITY
-+native_color: messaging-1 allocation score on controller-0: 0
-+native_color: messaging-1 allocation score on controller-1: 0
-+native_color: messaging-1 allocation score on controller-2: INFINITY
-+native_color: messaging-1 allocation score on database-0: -INFINITY
-+native_color: messaging-1 allocation score on database-1: -INFINITY
-+native_color: messaging-1 allocation score on database-2: -INFINITY
-+native_color: messaging-1 allocation score on messaging-0: -INFINITY
-+native_color: messaging-1 allocation score on messaging-1: -INFINITY
-+native_color: messaging-1 allocation score on messaging-2: -INFINITY
-+native_color: messaging-2 allocation score on controller-0: 0
-+native_color: messaging-2 allocation score on controller-1: 0
-+native_color: messaging-2 allocation score on controller-2: INFINITY
-+native_color: messaging-2 allocation score on database-0: -INFINITY
-+native_color: messaging-2 allocation score on database-1: -INFINITY
-+native_color: messaging-2 allocation score on database-2: -INFINITY
-+native_color: messaging-2 allocation score on messaging-0: -INFINITY
-+native_color: messaging-2 allocation score on messaging-1: -INFINITY
-+native_color: messaging-2 allocation score on messaging-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: 0
-+native_color: openstack-cinder-volume allocation score on database-0: -INFINITY
-+native_color: openstack-cinder-volume allocation score on database-1: -INFINITY
-+native_color: openstack-cinder-volume allocation score on database-2: -INFINITY
-+native_color: openstack-cinder-volume allocation score on messaging-0: -INFINITY
-+native_color: openstack-cinder-volume allocation score on messaging-1: -INFINITY
-+native_color: openstack-cinder-volume allocation score on messaging-2: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on controller-0: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on controller-1: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on controller-2: INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on database-0: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on database-1: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on database-2: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on messaging-0: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on messaging-1: -INFINITY
-+native_color: rabbitmq-bundle-0 allocation score on messaging-2: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on controller-0: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on controller-1: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on controller-2: INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on database-0: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on database-1: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on database-2: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on messaging-0: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on messaging-1: -INFINITY
-+native_color: rabbitmq-bundle-1 allocation score on messaging-2: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on controller-0: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on controller-1: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on controller-2: INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on database-0: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on database-1: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on database-2: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on messaging-0: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on messaging-1: -INFINITY
-+native_color: rabbitmq-bundle-2 allocation score on messaging-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
-+native_color: rabbitmq-bundle-docker-0 allocation score on database-0: -INFINITY
-+native_color: rabbitmq-bundle-docker-0 allocation score on database-1: -INFINITY
-+native_color: rabbitmq-bundle-docker-0 allocation score on database-2: -INFINITY
-+native_color: rabbitmq-bundle-docker-0 allocation score on messaging-0: INFINITY
-+native_color: rabbitmq-bundle-docker-0 allocation score on messaging-1: -10000
-+native_color: rabbitmq-bundle-docker-0 allocation score on messaging-2: -10000
-+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: -INFINITY
-+native_color: rabbitmq-bundle-docker-1 allocation score on database-0: -INFINITY
-+native_color: rabbitmq-bundle-docker-1 allocation score on database-1: -INFINITY
-+native_color: rabbitmq-bundle-docker-1 allocation score on database-2: -INFINITY
-+native_color: rabbitmq-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+native_color: rabbitmq-bundle-docker-1 allocation score on messaging-1: INFINITY
-+native_color: rabbitmq-bundle-docker-1 allocation score on messaging-2: -10000
-+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 database-0: -INFINITY
-+native_color: rabbitmq-bundle-docker-2 allocation score on database-1: -INFINITY
-+native_color: rabbitmq-bundle-docker-2 allocation score on database-2: -INFINITY
-+native_color: rabbitmq-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+native_color: rabbitmq-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+native_color: rabbitmq-bundle-docker-2 allocation score on messaging-2: INFINITY
-+native_color: rabbitmq:0 allocation score on rabbitmq-bundle-0: INFINITY
-+native_color: rabbitmq:1 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 database-0: -INFINITY
-+native_color: redis-bundle-0 allocation score on database-1: -INFINITY
-+native_color: redis-bundle-0 allocation score on database-2: -INFINITY
-+native_color: redis-bundle-0 allocation score on messaging-0: -INFINITY
-+native_color: redis-bundle-0 allocation score on messaging-1: -INFINITY
-+native_color: redis-bundle-0 allocation score on messaging-2: -INFINITY
-+native_color: redis-bundle-1 allocation score on controller-0: 0
-+native_color: redis-bundle-1 allocation score on controller-1: 10000
-+native_color: redis-bundle-1 allocation score on controller-2: 0
-+native_color: redis-bundle-1 allocation score on database-0: -INFINITY
-+native_color: redis-bundle-1 allocation score on database-1: -INFINITY
-+native_color: redis-bundle-1 allocation score on database-2: -INFINITY
-+native_color: redis-bundle-1 allocation score on messaging-0: -INFINITY
-+native_color: redis-bundle-1 allocation score on messaging-1: -INFINITY
-+native_color: redis-bundle-1 allocation score on messaging-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 database-0: -INFINITY
-+native_color: redis-bundle-2 allocation score on database-1: -INFINITY
-+native_color: redis-bundle-2 allocation score on database-2: -INFINITY
-+native_color: redis-bundle-2 allocation score on messaging-0: -INFINITY
-+native_color: redis-bundle-2 allocation score on messaging-1: -INFINITY
-+native_color: redis-bundle-2 allocation score on messaging-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: 0
-+native_color: redis-bundle-docker-0 allocation score on controller-2: 0
-+native_color: redis-bundle-docker-0 allocation score on database-0: -INFINITY
-+native_color: redis-bundle-docker-0 allocation score on database-1: -INFINITY
-+native_color: redis-bundle-docker-0 allocation score on database-2: -INFINITY
-+native_color: redis-bundle-docker-0 allocation score on messaging-0: -INFINITY
-+native_color: redis-bundle-docker-0 allocation score on messaging-1: -INFINITY
-+native_color: redis-bundle-docker-0 allocation score on messaging-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: 0
-+native_color: redis-bundle-docker-1 allocation score on controller-2: -INFINITY
-+native_color: redis-bundle-docker-1 allocation score on database-0: -INFINITY
-+native_color: redis-bundle-docker-1 allocation score on database-1: -INFINITY
-+native_color: redis-bundle-docker-1 allocation score on database-2: -INFINITY
-+native_color: redis-bundle-docker-1 allocation score on messaging-0: -INFINITY
-+native_color: redis-bundle-docker-1 allocation score on messaging-1: -INFINITY
-+native_color: redis-bundle-docker-1 allocation score on messaging-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: 0
-+native_color: redis-bundle-docker-2 allocation score on controller-2: INFINITY
-+native_color: redis-bundle-docker-2 allocation score on database-0: -INFINITY
-+native_color: redis-bundle-docker-2 allocation score on database-1: -INFINITY
-+native_color: redis-bundle-docker-2 allocation score on database-2: -INFINITY
-+native_color: redis-bundle-docker-2 allocation score on messaging-0: -INFINITY
-+native_color: redis-bundle-docker-2 allocation score on messaging-1: -INFINITY
-+native_color: redis-bundle-docker-2 allocation score on messaging-2: -INFINITY
-+native_color: redis:0 allocation score on redis-bundle-0: INFINITY
-+native_color: redis:1 allocation score on redis-bundle-1: INFINITY
-+native_color: redis:2 allocation score on redis-bundle-2: INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on controller-2: INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400244e09 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on controller-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on controller-2: 0
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400498d34 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on controller-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400542c06 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on controller-2: 0
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-5254005ea387 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on controller-2: INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a25787 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on controller-0: INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on controller-2: 0
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400a7f9e0 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on controller-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on controller-2: INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400aac413 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on controller-2: 0
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400c709f7 allocation score on messaging-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on controller-0: 0
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on controller-1: 0
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on controller-2: INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on database-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on database-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on database-2: -INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on messaging-0: -INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on messaging-1: -INFINITY
-+native_color: stonith-fence_ipmilan-525400cdec10 allocation score on messaging-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-stop-on-remote.summary b/pengine/test10/bundle-order-stop-on-remote.summary
-new file mode 100644
-index 0000000..8a04599
---- /dev/null
-+++ b/pengine/test10/bundle-order-stop-on-remote.summary
-@@ -0,0 +1,224 @@
-+
-+Current cluster status:
-+RemoteNode database-0: UNCLEAN (offline)
-+RemoteNode database-2: UNCLEAN (offline)
-+Online: [ controller-0 controller-1 controller-2 ]
-+RemoteOnline: [ database-1 messaging-0 messaging-1 messaging-2 ]
-+Containers: [ galera-bundle-1:galera-bundle-docker-1 rabbitmq-bundle-0:rabbitmq-bundle-docker-0 rabbitmq-bundle-1:rabbitmq-bundle-docker-1 rabbitmq-bundle-2:rabbitmq-bundle-docker-2 redis-bundle-0:redis-bundle-docker-0 redis-bundle-2:redis-bundle-docker-2 ]
-+
-+ database-0 (ocf::pacemaker:remote): Stopped
-+ database-1 (ocf::pacemaker:remote): Started controller-2
-+ database-2 (ocf::pacemaker:remote): Stopped
-+ messaging-0 (ocf::pacemaker:remote): Started controller-2
-+ messaging-1 (ocf::pacemaker:remote): Started controller-2
-+ messaging-2 (ocf::pacemaker:remote): Started controller-2
-+ Docker container set: rabbitmq-bundle [192.168.24.1:8787/rhosp12/openstack-rabbitmq-docker:pcmklatest]
-+ rabbitmq-bundle-0 (ocf::heartbeat:rabbitmq-cluster): Started messaging-0
-+ rabbitmq-bundle-1 (ocf::heartbeat:rabbitmq-cluster): Started messaging-1
-+ rabbitmq-bundle-2 (ocf::heartbeat:rabbitmq-cluster): Started messaging-2
-+ Docker container set: galera-bundle [192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest]
-+ galera-bundle-0 (ocf::heartbeat:galera): FAILED Master database-0 (UNCLEAN)
-+ galera-bundle-1 (ocf::heartbeat:galera): Master database-1
-+ galera-bundle-2 (ocf::heartbeat:galera): FAILED Master database-2 (UNCLEAN)
-+ Docker container set: redis-bundle [192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest]
-+ redis-bundle-0 (ocf::heartbeat:redis): Slave controller-0
-+ redis-bundle-1 (ocf::heartbeat:redis): Stopped
-+ redis-bundle-2 (ocf::heartbeat:redis): Slave controller-2
-+ ip-192.168.24.11 (ocf::heartbeat:IPaddr2): Stopped
-+ ip-10.0.0.104 (ocf::heartbeat:IPaddr2): Stopped
-+ ip-172.17.1.19 (ocf::heartbeat:IPaddr2): Started controller-2
-+ ip-172.17.1.11 (ocf::heartbeat:IPaddr2): Stopped
-+ ip-172.17.3.13 (ocf::heartbeat:IPaddr2): Stopped
-+ ip-172.17.4.19 (ocf::heartbeat:IPaddr2): Started controller-2
-+ Docker container set: haproxy-bundle [192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest]
-+ haproxy-bundle-docker-0 (ocf::heartbeat:docker): Started controller-0
-+ haproxy-bundle-docker-1 (ocf::heartbeat:docker): Stopped
-+ haproxy-bundle-docker-2 (ocf::heartbeat:docker): Started controller-2
-+ openstack-cinder-volume (systemd:openstack-cinder-volume): Stopped
-+ stonith-fence_ipmilan-525400244e09 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-525400cdec10 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-525400c709f7 (stonith:fence_ipmilan): Stopped
-+ stonith-fence_ipmilan-525400a7f9e0 (stonith:fence_ipmilan): Started controller-0
-+ stonith-fence_ipmilan-525400a25787 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-5254005ea387 (stonith:fence_ipmilan): Stopped
-+ stonith-fence_ipmilan-525400542c06 (stonith:fence_ipmilan): Stopped
-+ stonith-fence_ipmilan-525400aac413 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-525400498d34 (stonith:fence_ipmilan): Stopped
-+
-+Transition Summary:
-+ * Fence (reboot) galera-bundle-2 (resource: galera-bundle-docker-2) 'guest is unclean'
-+ * Fence (reboot) galera-bundle-0 (resource: galera-bundle-docker-0) 'guest is unclean'
-+ * Start database-0 ( controller-0 )
-+ * Start database-2 ( controller-1 )
-+ * Recover galera-bundle-docker-0 ( database-0 )
-+ * Start galera-bundle-0 ( controller-0 )
-+ * Recover galera:0 ( Master galera-bundle-0 )
-+ * Recover galera-bundle-docker-2 ( database-2 )
-+ * Start galera-bundle-2 ( controller-1 )
-+ * Recover galera:2 ( Master galera-bundle-2 )
-+ * Promote redis:0 ( Slave -> Master redis-bundle-0 )
-+ * Start redis-bundle-docker-1 ( controller-1 )
-+ * Start redis-bundle-1 ( controller-1 )
-+ * Start redis:1 ( redis-bundle-1 )
-+ * Start ip-192.168.24.11 ( controller-0 )
-+ * Start ip-10.0.0.104 ( controller-1 )
-+ * Start ip-172.17.1.11 ( controller-0 )
-+ * Start ip-172.17.3.13 ( controller-1 )
-+ * Start haproxy-bundle-docker-1 ( controller-1 )
-+ * Start openstack-cinder-volume ( controller-0 )
-+ * Start stonith-fence_ipmilan-525400c709f7 ( controller-1 )
-+ * Start stonith-fence_ipmilan-5254005ea387 ( controller-1 )
-+ * Start stonith-fence_ipmilan-525400542c06 ( controller-0 )
-+ * Start stonith-fence_ipmilan-525400498d34 ( controller-1 )
-+
-+Executing cluster transition:
-+ * Resource action: database-0 start on controller-0
-+ * Resource action: database-2 start on controller-1
-+ * Pseudo action: redis-bundle-master_pre_notify_start_0
-+ * Resource action: stonith-fence_ipmilan-525400c709f7 start on controller-1
-+ * Resource action: stonith-fence_ipmilan-5254005ea387 start on controller-1
-+ * Resource action: stonith-fence_ipmilan-525400542c06 start on controller-0
-+ * Resource action: stonith-fence_ipmilan-525400498d34 start on controller-1
-+ * Pseudo action: redis-bundle_start_0
-+ * Pseudo action: galera-bundle_demote_0
-+ * Resource action: database-0 monitor=20000 on controller-0
-+ * Resource action: database-2 monitor=20000 on controller-1
-+ * Pseudo action: galera-bundle-master_demote_0
-+ * Resource action: redis notify on redis-bundle-0
-+ * Resource action: redis notify on redis-bundle-2
-+ * Pseudo action: redis-bundle-master_confirmed-pre_notify_start_0
-+ * Pseudo action: redis-bundle-master_start_0
-+ * Resource action: stonith-fence_ipmilan-525400c709f7 monitor=60000 on controller-1
-+ * Resource action: stonith-fence_ipmilan-5254005ea387 monitor=60000 on controller-1
-+ * Resource action: stonith-fence_ipmilan-525400542c06 monitor=60000 on controller-0
-+ * Resource action: stonith-fence_ipmilan-525400498d34 monitor=60000 on controller-1
-+ * Pseudo action: galera_demote_0
-+ * Pseudo action: galera_demote_0
-+ * Pseudo action: galera-bundle-master_demoted_0
-+ * Pseudo action: galera-bundle_demoted_0
-+ * Pseudo action: galera-bundle_stop_0
-+ * Resource action: galera-bundle-docker-0 stop on database-0
-+ * Resource action: galera-bundle-docker-2 stop on database-2
-+ * Pseudo action: stonith-galera-bundle-2-reboot on galera-bundle-2
-+ * Pseudo action: stonith-galera-bundle-0-reboot on galera-bundle-0
-+ * Pseudo action: stonith_complete
-+ * Pseudo action: galera-bundle-master_stop_0
-+ * Resource action: redis-bundle-docker-1 start on controller-1
-+ * Resource action: redis-bundle-1 monitor on controller-1
-+ * Resource action: ip-192.168.24.11 start on controller-0
-+ * Resource action: ip-10.0.0.104 start on controller-1
-+ * Resource action: ip-172.17.1.11 start on controller-0
-+ * Resource action: ip-172.17.3.13 start on controller-1
-+ * Resource action: openstack-cinder-volume start on controller-0
-+ * Pseudo action: haproxy-bundle_start_0
-+ * Pseudo action: galera_stop_0
-+ * Resource action: redis-bundle-docker-1 monitor=60000 on controller-1
-+ * Resource action: redis-bundle-1 start on controller-1
-+ * Resource action: ip-192.168.24.11 monitor=10000 on controller-0
-+ * Resource action: ip-10.0.0.104 monitor=10000 on controller-1
-+ * Resource action: ip-172.17.1.11 monitor=10000 on controller-0
-+ * Resource action: ip-172.17.3.13 monitor=10000 on controller-1
-+ * Resource action: haproxy-bundle-docker-1 start on controller-1
-+ * Resource action: openstack-cinder-volume monitor=60000 on controller-0
-+ * Pseudo action: haproxy-bundle_running_0
-+ * Pseudo action: galera_stop_0
-+ * Pseudo action: galera-bundle-master_stopped_0
-+ * Resource action: redis start on redis-bundle-1
-+ * Pseudo action: redis-bundle-master_running_0
-+ * Resource action: redis-bundle-1 monitor=60000 on controller-1
-+ * Resource action: haproxy-bundle-docker-1 monitor=60000 on controller-1
-+ * Pseudo action: galera-bundle_stopped_0
-+ * Pseudo action: galera-bundle_start_0
-+ * Pseudo action: all_stopped
-+ * Pseudo action: galera-bundle-master_start_0
-+ * Resource action: galera-bundle-docker-0 start on database-0
-+ * Resource action: galera-bundle-0 monitor on controller-1
-+ * Resource action: galera-bundle-docker-2 start on database-2
-+ * Resource action: galera-bundle-2 monitor on controller-1
-+ * Pseudo action: redis-bundle-master_post_notify_running_0
-+ * Resource action: galera-bundle-docker-0 monitor=60000 on database-0
-+ * Resource action: galera-bundle-0 start on controller-0
-+ * Resource action: galera-bundle-docker-2 monitor=60000 on database-2
-+ * Resource action: galera-bundle-2 start on controller-1
-+ * Resource action: redis notify on redis-bundle-0
-+ * Resource action: redis notify on redis-bundle-1
-+ * Resource action: redis notify on redis-bundle-2
-+ * Pseudo action: redis-bundle-master_confirmed-post_notify_running_0
-+ * Pseudo action: redis-bundle_running_0
-+ * Resource action: galera start on galera-bundle-0
-+ * Resource action: galera start on galera-bundle-2
-+ * Pseudo action: galera-bundle-master_running_0
-+ * Resource action: galera-bundle-0 monitor=60000 on controller-0
-+ * Resource action: galera-bundle-2 monitor=60000 on controller-1
-+ * Pseudo action: redis-bundle-master_pre_notify_promote_0
-+ * Pseudo action: redis-bundle_promote_0
-+ * Pseudo action: galera-bundle_running_0
-+ * Resource action: redis notify on redis-bundle-0
-+ * Resource action: redis notify on redis-bundle-1
-+ * Resource action: redis notify on redis-bundle-2
-+ * Pseudo action: redis-bundle-master_confirmed-pre_notify_promote_0
-+ * Pseudo action: redis-bundle-master_promote_0
-+ * Pseudo action: galera-bundle_promote_0
-+ * Pseudo action: galera-bundle-master_promote_0
-+ * Resource action: redis promote on redis-bundle-0
-+ * Pseudo action: redis-bundle-master_promoted_0
-+ * Resource action: galera promote on galera-bundle-0
-+ * Resource action: galera promote on galera-bundle-2
-+ * Pseudo action: galera-bundle-master_promoted_0
-+ * Pseudo action: redis-bundle-master_post_notify_promoted_0
-+ * Pseudo action: galera-bundle_promoted_0
-+ * Resource action: galera monitor=10000 on galera-bundle-0
-+ * Resource action: galera monitor=10000 on galera-bundle-2
-+ * Resource action: redis notify on redis-bundle-0
-+ * Resource action: redis notify on redis-bundle-1
-+ * Resource action: redis notify on redis-bundle-2
-+ * Pseudo action: redis-bundle-master_confirmed-post_notify_promoted_0
-+ * Pseudo action: redis-bundle_promoted_0
-+ * Resource action: redis monitor=20000 on redis-bundle-0
-+ * Resource action: redis monitor=60000 on redis-bundle-1
-+ * Resource action: redis monitor=45000 on redis-bundle-1
-+
-+Revised cluster status:
-+Online: [ controller-0 controller-1 controller-2 ]
-+RemoteOnline: [ database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 ]
-+Containers: [ galera-bundle-0:galera-bundle-docker-0 galera-bundle-1:galera-bundle-docker-1 galera-bundle-2:galera-bundle-docker-2 rabbitmq-bundle-0:rabbitmq-bundle-docker-0 rabbitmq-bundle-1:rabbitmq-bundle-docker-1 rabbitmq-bundle-2:rabbitmq-bundle-docker-2 redis-bundle-0:redis-bundle-docker-0 redis-bundle-1:redis-bundle-docker-1 redis-bundle-2:redis-bundle-docker-2 ]
-+
-+ database-0 (ocf::pacemaker:remote): Started controller-0
-+ database-1 (ocf::pacemaker:remote): Started controller-2
-+ database-2 (ocf::pacemaker:remote): Started controller-1
-+ messaging-0 (ocf::pacemaker:remote): Started controller-2
-+ messaging-1 (ocf::pacemaker:remote): Started controller-2
-+ messaging-2 (ocf::pacemaker:remote): Started controller-2
-+ Docker container set: rabbitmq-bundle [192.168.24.1:8787/rhosp12/openstack-rabbitmq-docker:pcmklatest]
-+ rabbitmq-bundle-0 (ocf::heartbeat:rabbitmq-cluster): Started messaging-0
-+ rabbitmq-bundle-1 (ocf::heartbeat:rabbitmq-cluster): Started messaging-1
-+ rabbitmq-bundle-2 (ocf::heartbeat:rabbitmq-cluster): Started messaging-2
-+ Docker container set: galera-bundle [192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest]
-+ galera-bundle-0 (ocf::heartbeat:galera): Master database-0
-+ galera-bundle-1 (ocf::heartbeat:galera): Master database-1
-+ galera-bundle-2 (ocf::heartbeat:galera): Master database-2
-+ Docker container set: redis-bundle [192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest]
-+ redis-bundle-0 (ocf::heartbeat:redis): Master controller-0
-+ redis-bundle-1 (ocf::heartbeat:redis): Slave controller-1
-+ redis-bundle-2 (ocf::heartbeat:redis): Slave controller-2
-+ ip-192.168.24.11 (ocf::heartbeat:IPaddr2): Started controller-0
-+ ip-10.0.0.104 (ocf::heartbeat:IPaddr2): Started controller-1
-+ ip-172.17.1.19 (ocf::heartbeat:IPaddr2): Started controller-2
-+ ip-172.17.1.11 (ocf::heartbeat:IPaddr2): Started controller-0
-+ ip-172.17.3.13 (ocf::heartbeat:IPaddr2): Started controller-1
-+ ip-172.17.4.19 (ocf::heartbeat:IPaddr2): Started controller-2
-+ Docker container set: haproxy-bundle [192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest]
-+ haproxy-bundle-docker-0 (ocf::heartbeat:docker): Started controller-0
-+ haproxy-bundle-docker-1 (ocf::heartbeat:docker): Started controller-1
-+ haproxy-bundle-docker-2 (ocf::heartbeat:docker): Started controller-2
-+ openstack-cinder-volume (systemd:openstack-cinder-volume): Started controller-0
-+ stonith-fence_ipmilan-525400244e09 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-525400cdec10 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-525400c709f7 (stonith:fence_ipmilan): Started controller-1
-+ stonith-fence_ipmilan-525400a7f9e0 (stonith:fence_ipmilan): Started controller-0
-+ stonith-fence_ipmilan-525400a25787 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-5254005ea387 (stonith:fence_ipmilan): Started controller-1
-+ stonith-fence_ipmilan-525400542c06 (stonith:fence_ipmilan): Started controller-0
-+ stonith-fence_ipmilan-525400aac413 (stonith:fence_ipmilan): Started controller-2
-+ stonith-fence_ipmilan-525400498d34 (stonith:fence_ipmilan): Started controller-1
-+
-diff --git a/pengine/test10/bundle-order-stop-on-remote.xml b/pengine/test10/bundle-order-stop-on-remote.xml
-new file mode 100644
-index 0000000..d3b87c8
---- /dev/null
-+++ b/pengine/test10/bundle-order-stop-on-remote.xml
-@@ -0,0 +1,1165 @@
-+<cib crm_feature_set="3.0.12" validate-with="pacemaker-2.8" epoch="121" num_updates="82" admin_epoch="0" cib-last-written="Sun Dec 3 22:42:32 2017" update-origin="controller-0" update-client="crmd" update-user="hacluster" have-quorum="1" dc-uuid="3">
-+ <configuration>
-+ <crm_config>
-+ <cluster_property_set id="cib-bootstrap-options">
-+ <nvpair id="cib-bootstrap-options-have-watchdog" name="have-watchdog" value="false"/>
-+ <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.16-12.el7_4.5-94ff4df"/>
-+ <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
-+ <nvpair id="cib-bootstrap-options-cluster-name" name="cluster-name" value="tripleo_cluster"/>
-+ <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
-+ <nvpair id="cib-bootstrap-options-cluster-recheck-interval" name="cluster-recheck-interval" value="60s"/>
-+ <nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1512340952"/>
-+ </cluster_property_set>
-+ <cluster_property_set id="redis_replication">
-+ <nvpair id="redis_replication-redis_REPL_INFO" name="redis_REPL_INFO" value="controller-1"/>
-+ </cluster_property_set>
-+ </crm_config>
-+ <nodes>
-+ <node id="1" uname="controller-0">
-+ <instance_attributes id="nodes-1">
-+ <nvpair id="nodes-1-cinder-volume-role" name="cinder-volume-role" value="true"/>
-+ <nvpair id="nodes-1-redis-role" name="redis-role" value="true"/>
-+ <nvpair id="nodes-1-haproxy-role" name="haproxy-role" value="true"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="2" uname="controller-1">
-+ <instance_attributes id="nodes-2">
-+ <nvpair id="nodes-2-cinder-volume-role" name="cinder-volume-role" value="true"/>
-+ <nvpair id="nodes-2-redis-role" name="redis-role" value="true"/>
-+ <nvpair id="nodes-2-haproxy-role" name="haproxy-role" value="true"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="3" uname="controller-2">
-+ <instance_attributes id="nodes-3">
-+ <nvpair id="nodes-3-cinder-volume-role" name="cinder-volume-role" value="true"/>
-+ <nvpair id="nodes-3-redis-role" name="redis-role" value="true"/>
-+ <nvpair id="nodes-3-haproxy-role" name="haproxy-role" value="true"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="messaging-0" type="remote" uname="messaging-0">
-+ <instance_attributes id="nodes-messaging-0">
-+ <nvpair id="nodes-messaging-0-rabbitmq-role" name="rabbitmq-role" value="true"/>
-+ <nvpair id="nodes-messaging-0-rmq-node-attr-last-known-rabbitmq" name="rmq-node-attr-last-known-rabbitmq" value="rabbit@messaging-0"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="database-0" type="remote" uname="database-0">
-+ <instance_attributes id="nodes-database-0">
-+ <nvpair id="nodes-database-0-galera-role" name="galera-role" value="true"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="messaging-1" type="remote" uname="messaging-1">
-+ <instance_attributes id="nodes-messaging-1">
-+ <nvpair id="nodes-messaging-1-rabbitmq-role" name="rabbitmq-role" value="true"/>
-+ <nvpair id="nodes-messaging-1-rmq-node-attr-last-known-rabbitmq" name="rmq-node-attr-last-known-rabbitmq" value="rabbit@messaging-1"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="messaging-2" type="remote" uname="messaging-2">
-+ <instance_attributes id="nodes-messaging-2">
-+ <nvpair id="nodes-messaging-2-rabbitmq-role" name="rabbitmq-role" value="true"/>
-+ <nvpair id="nodes-messaging-2-rmq-node-attr-last-known-rabbitmq" name="rmq-node-attr-last-known-rabbitmq" value="rabbit@messaging-2"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="database-1" type="remote" uname="database-1">
-+ <instance_attributes id="nodes-database-1">
-+ <nvpair id="nodes-database-1-galera-role" name="galera-role" value="true"/>
-+ </instance_attributes>
-+ </node>
-+ <node id="database-2" type="remote" uname="database-2">
-+ <instance_attributes id="nodes-database-2">
-+ <nvpair id="nodes-database-2-galera-role" name="galera-role" value="true"/>
-+ </instance_attributes>
-+ </node>
-+ </nodes>
-+ <resources>
-+ <primitive class="ocf" id="database-0" provider="pacemaker" type="remote">
-+ <instance_attributes id="database-0-instance_attributes">
-+ <nvpair id="database-0-instance_attributes-reconnect_interval" name="reconnect_interval" value="60"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="database-0-monitor-interval-20" interval="20" name="monitor"/>
-+ <op id="database-0-start-interval-0s" interval="0s" name="start" timeout="60"/>
-+ <op id="database-0-stop-interval-0s" interval="0s" name="stop" timeout="60"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="database-1" provider="pacemaker" type="remote">
-+ <instance_attributes id="database-1-instance_attributes">
-+ <nvpair id="database-1-instance_attributes-reconnect_interval" name="reconnect_interval" value="60"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="database-1-monitor-interval-20" interval="20" name="monitor"/>
-+ <op id="database-1-start-interval-0s" interval="0s" name="start" timeout="60"/>
-+ <op id="database-1-stop-interval-0s" interval="0s" name="stop" timeout="60"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="database-2" provider="pacemaker" type="remote">
-+ <instance_attributes id="database-2-instance_attributes">
-+ <nvpair id="database-2-instance_attributes-reconnect_interval" name="reconnect_interval" value="60"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="database-2-monitor-interval-20" interval="20" name="monitor"/>
-+ <op id="database-2-start-interval-0s" interval="0s" name="start" timeout="60"/>
-+ <op id="database-2-stop-interval-0s" interval="0s" name="stop" timeout="60"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="messaging-0" provider="pacemaker" type="remote">
-+ <instance_attributes id="messaging-0-instance_attributes">
-+ <nvpair id="messaging-0-instance_attributes-reconnect_interval" name="reconnect_interval" value="60"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="messaging-0-monitor-interval-20" interval="20" name="monitor"/>
-+ <op id="messaging-0-start-interval-0s" interval="0s" name="start" timeout="60"/>
-+ <op id="messaging-0-stop-interval-0s" interval="0s" name="stop" timeout="60"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="messaging-1" provider="pacemaker" type="remote">
-+ <instance_attributes id="messaging-1-instance_attributes">
-+ <nvpair id="messaging-1-instance_attributes-reconnect_interval" name="reconnect_interval" value="60"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="messaging-1-monitor-interval-20" interval="20" name="monitor"/>
-+ <op id="messaging-1-start-interval-0s" interval="0s" name="start" timeout="60"/>
-+ <op id="messaging-1-stop-interval-0s" interval="0s" name="stop" timeout="60"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="messaging-2" provider="pacemaker" type="remote">
-+ <instance_attributes id="messaging-2-instance_attributes">
-+ <nvpair id="messaging-2-instance_attributes-reconnect_interval" name="reconnect_interval" value="60"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="messaging-2-monitor-interval-20" interval="20" name="monitor"/>
-+ <op id="messaging-2-start-interval-0s" interval="0s" name="start" timeout="60"/>
-+ <op id="messaging-2-stop-interval-0s" interval="0s" name="stop" timeout="60"/>
-+ </operations>
-+ </primitive>
-+ <bundle id="rabbitmq-bundle">
-+ <docker image="192.168.24.1:8787/rhosp12/openstack-rabbitmq-docker:pcmklatest" network="host" options="--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS" replicas="3" run-command="/bin/bash /usr/local/bin/kolla_start"/>
-+ <network control-port="3122"/>
-+ <storage>
-+ <storage-mapping id="rabbitmq-cfg-files" options="ro" source-dir="/var/lib/kolla/config_files/rabbitmq.json" target-dir="/var/lib/kolla/config_files/config.json"/>
-+ <storage-mapping id="rabbitmq-cfg-data" options="ro" source-dir="/var/lib/config-data/puppet-generated/rabbitmq/" target-dir="/var/lib/kolla/config_files/src"/>
-+ <storage-mapping id="rabbitmq-hosts" options="ro" source-dir="/etc/hosts" target-dir="/etc/hosts"/>
-+ <storage-mapping id="rabbitmq-localtime" options="ro" source-dir="/etc/localtime" target-dir="/etc/localtime"/>
-+ <storage-mapping id="rabbitmq-lib" options="rw" source-dir="/var/lib/rabbitmq" target-dir="/var/lib/rabbitmq"/>
-+ <storage-mapping id="rabbitmq-pki-extracted" options="ro" source-dir="/etc/pki/ca-trust/extracted" target-dir="/etc/pki/ca-trust/extracted"/>
-+ <storage-mapping id="rabbitmq-pki-ca-bundle-crt" options="ro" source-dir="/etc/pki/tls/certs/ca-bundle.crt" target-dir="/etc/pki/tls/certs/ca-bundle.crt"/>
-+ <storage-mapping id="rabbitmq-pki-ca-bundle-trust-crt" options="ro" source-dir="/etc/pki/tls/certs/ca-bundle.trust.crt" target-dir="/etc/pki/tls/certs/ca-bundle.trust.crt"/>
-+ <storage-mapping id="rabbitmq-pki-cert" options="ro" source-dir="/etc/pki/tls/cert.pem" target-dir="/etc/pki/tls/cert.pem"/>
-+ <storage-mapping id="rabbitmq-dev-log" options="rw" source-dir="/dev/log" target-dir="/dev/log"/>
-+ </storage>
-+ <primitive class="ocf" id="rabbitmq" provider="heartbeat" type="rabbitmq-cluster">
-+ <instance_attributes id="rabbitmq-instance_attributes">
-+ <nvpair id="rabbitmq-instance_attributes-set_policy" name="set_policy" value="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ </instance_attributes>
-+ <meta_attributes id="rabbitmq-meta_attributes">
-+ <nvpair id="rabbitmq-meta_attributes-container-attribute-target" name="container-attribute-target" value="host"/>
-+ <nvpair id="rabbitmq-meta_attributes-notify" name="notify" value="true"/>
-+ </meta_attributes>
-+ <operations>
-+ <op id="rabbitmq-monitor-interval-10" interval="10" name="monitor" timeout="40"/>
-+ <op id="rabbitmq-start-interval-0s" interval="0s" name="start" timeout="200s"/>
-+ <op id="rabbitmq-stop-interval-0s" interval="0s" name="stop" timeout="200s"/>
-+ </operations>
-+ </primitive>
-+ </bundle>
-+ <bundle id="galera-bundle">
-+ <docker image="192.168.24.1:8787/rhosp12/openstack-mariadb-docker:pcmklatest" masters="3" network="host" options="--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS" replicas="3" run-command="/bin/bash /usr/local/bin/kolla_start"/>
-+ <network control-port="3123"/>
-+ <storage>
-+ <storage-mapping id="mysql-cfg-files" options="ro" source-dir="/var/lib/kolla/config_files/mysql.json" target-dir="/var/lib/kolla/config_files/config.json"/>
-+ <storage-mapping id="mysql-cfg-data" options="ro" source-dir="/var/lib/config-data/puppet-generated/mysql/" target-dir="/var/lib/kolla/config_files/src"/>
-+ <storage-mapping id="mysql-hosts" options="ro" source-dir="/etc/hosts" target-dir="/etc/hosts"/>
-+ <storage-mapping id="mysql-localtime" options="ro" source-dir="/etc/localtime" target-dir="/etc/localtime"/>
-+ <storage-mapping id="mysql-lib" options="rw" source-dir="/var/lib/mysql" target-dir="/var/lib/mysql"/>
-+ <storage-mapping id="mysql-log-mariadb" options="rw" source-dir="/var/log/mariadb" target-dir="/var/log/mariadb"/>
-+ <storage-mapping id="mysql-dev-log" options="rw" source-dir="/dev/log" target-dir="/dev/log"/>
-+ </storage>
-+ <primitive class="ocf" id="galera" provider="heartbeat" type="galera">
-+ <instance_attributes id="galera-instance_attributes">
-+ <nvpair id="galera-instance_attributes-additional_parameters" name="additional_parameters" value="--open-files-limit=16384"/>
-+ <nvpair id="galera-instance_attributes-cluster_host_map" name="cluster_host_map" value="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"/>
-+ <nvpair id="galera-instance_attributes-enable_creation" name="enable_creation" value="true"/>
-+ <nvpair id="galera-instance_attributes-wsrep_cluster_address" name="wsrep_cluster_address" value="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
-+ </instance_attributes>
-+ <meta_attributes id="galera-meta_attributes">
-+ <nvpair id="galera-meta_attributes-container-attribute-target" name="container-attribute-target" value="host"/>
-+ <nvpair id="galera-meta_attributes-master-max" name="master-max" value="3"/>
-+ <nvpair id="galera-meta_attributes-ordered" name="ordered" value="true"/>
-+ </meta_attributes>
-+ <operations>
-+ <op id="galera-demote-interval-0s" interval="0s" name="demote" timeout="120"/>
-+ <op id="galera-monitor-interval-20" interval="20" name="monitor" timeout="30"/>
-+ <op id="galera-monitor-interval-10" interval="10" name="monitor" role="Master" timeout="30"/>
-+ <op id="galera-monitor-interval-30" interval="30" name="monitor" role="Slave" timeout="30"/>
-+ <op id="galera-promote-interval-0s" interval="0s" name="promote" on-fail="block" timeout="300s"/>
-+ <op id="galera-start-interval-0s" interval="0s" name="start" timeout="120"/>
-+ <op id="galera-stop-interval-0s" interval="0s" name="stop" timeout="120"/>
-+ </operations>
-+ </primitive>
-+ </bundle>
-+ <bundle id="redis-bundle">
-+ <docker image="192.168.24.1:8787/rhosp12/openstack-redis-docker:pcmklatest" masters="1" network="host" options="--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS" replicas="3" run-command="/bin/bash /usr/local/bin/kolla_start"/>
-+ <network control-port="3124"/>
-+ <storage>
-+ <storage-mapping id="redis-cfg-files" options="ro" source-dir="/var/lib/kolla/config_files/redis.json" target-dir="/var/lib/kolla/config_files/config.json"/>
-+ <storage-mapping id="redis-cfg-data-redis" options="ro" source-dir="/var/lib/config-data/puppet-generated/redis/" target-dir="/var/lib/kolla/config_files/src"/>
-+ <storage-mapping id="redis-hosts" options="ro" source-dir="/etc/hosts" target-dir="/etc/hosts"/>
-+ <storage-mapping id="redis-localtime" options="ro" source-dir="/etc/localtime" target-dir="/etc/localtime"/>
-+ <storage-mapping id="redis-lib" options="rw" source-dir="/var/lib/redis" target-dir="/var/lib/redis"/>
-+ <storage-mapping id="redis-log" options="rw" source-dir="/var/log/redis" target-dir="/var/log/redis"/>
-+ <storage-mapping id="redis-run" options="rw" source-dir="/var/run/redis" target-dir="/var/run/redis"/>
-+ <storage-mapping id="redis-pki-extracted" options="ro" source-dir="/etc/pki/ca-trust/extracted" target-dir="/etc/pki/ca-trust/extracted"/>
-+ <storage-mapping id="redis-pki-ca-bundle-crt" options="ro" source-dir="/etc/pki/tls/certs/ca-bundle.crt" target-dir="/etc/pki/tls/certs/ca-bundle.crt"/>
-+ <storage-mapping id="redis-pki-ca-bundle-trust-crt" options="ro" source-dir="/etc/pki/tls/certs/ca-bundle.trust.crt" target-dir="/etc/pki/tls/certs/ca-bundle.trust.crt"/>
-+ <storage-mapping id="redis-pki-cert" options="ro" source-dir="/etc/pki/tls/cert.pem" target-dir="/etc/pki/tls/cert.pem"/>
-+ <storage-mapping id="redis-dev-log" options="rw" source-dir="/dev/log" target-dir="/dev/log"/>
-+ </storage>
-+ <primitive class="ocf" id="redis" provider="heartbeat" type="redis">
-+ <instance_attributes id="redis-instance_attributes">
-+ <nvpair id="redis-instance_attributes-wait_last_known_master" name="wait_last_known_master" value="true"/>
-+ </instance_attributes>
-+ <meta_attributes id="redis-meta_attributes">
-+ <nvpair id="redis-meta_attributes-container-attribute-target" name="container-attribute-target" value="host"/>
-+ <nvpair id="redis-meta_attributes-interleave" name="interleave" value="true"/>
-+ <nvpair id="redis-meta_attributes-notify" name="notify" value="true"/>
-+ <nvpair id="redis-meta_attributes-ordered" name="ordered" value="true"/>
-+ </meta_attributes>
-+ <operations>
-+ <op id="redis-demote-interval-0s" interval="0s" name="demote" timeout="120"/>
-+ <op id="redis-monitor-interval-45" interval="45" name="monitor" timeout="60"/>
-+ <op id="redis-monitor-interval-20" interval="20" name="monitor" role="Master" timeout="60"/>
-+ <op id="redis-monitor-interval-60" interval="60" name="monitor" role="Slave" timeout="60"/>
-+ <op id="redis-promote-interval-0s" interval="0s" name="promote" timeout="120"/>
-+ <op id="redis-start-interval-0s" interval="0s" name="start" timeout="200s"/>
-+ <op id="redis-stop-interval-0s" interval="0s" name="stop" timeout="200s"/>
-+ </operations>
-+ </primitive>
-+ </bundle>
-+ <primitive class="ocf" id="ip-192.168.24.11" provider="heartbeat" type="IPaddr2">
-+ <instance_attributes id="ip-192.168.24.11-instance_attributes">
-+ <nvpair id="ip-192.168.24.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/>
-+ <nvpair id="ip-192.168.24.11-instance_attributes-ip" name="ip" value="192.168.24.11"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="ip-192.168.24.11-monitor-interval-10s" interval="10s" name="monitor" timeout="20s"/>
-+ <op id="ip-192.168.24.11-start-interval-0s" interval="0s" name="start" timeout="20s"/>
-+ <op id="ip-192.168.24.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="ip-10.0.0.104" provider="heartbeat" type="IPaddr2">
-+ <instance_attributes id="ip-10.0.0.104-instance_attributes">
-+ <nvpair id="ip-10.0.0.104-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/>
-+ <nvpair id="ip-10.0.0.104-instance_attributes-ip" name="ip" value="10.0.0.104"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="ip-10.0.0.104-monitor-interval-10s" interval="10s" name="monitor" timeout="20s"/>
-+ <op id="ip-10.0.0.104-start-interval-0s" interval="0s" name="start" timeout="20s"/>
-+ <op id="ip-10.0.0.104-stop-interval-0s" interval="0s" name="stop" timeout="20s"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="ip-172.17.1.19" provider="heartbeat" type="IPaddr2">
-+ <instance_attributes id="ip-172.17.1.19-instance_attributes">
-+ <nvpair id="ip-172.17.1.19-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/>
-+ <nvpair id="ip-172.17.1.19-instance_attributes-ip" name="ip" value="172.17.1.19"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="ip-172.17.1.19-monitor-interval-10s" interval="10s" name="monitor" timeout="20s"/>
-+ <op id="ip-172.17.1.19-start-interval-0s" interval="0s" name="start" timeout="20s"/>
-+ <op id="ip-172.17.1.19-stop-interval-0s" interval="0s" name="stop" timeout="20s"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="ip-172.17.1.11" provider="heartbeat" type="IPaddr2">
-+ <instance_attributes id="ip-172.17.1.11-instance_attributes">
-+ <nvpair id="ip-172.17.1.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/>
-+ <nvpair id="ip-172.17.1.11-instance_attributes-ip" name="ip" value="172.17.1.11"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="ip-172.17.1.11-monitor-interval-10s" interval="10s" name="monitor" timeout="20s"/>
-+ <op id="ip-172.17.1.11-start-interval-0s" interval="0s" name="start" timeout="20s"/>
-+ <op id="ip-172.17.1.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="ip-172.17.3.13" provider="heartbeat" type="IPaddr2">
-+ <instance_attributes id="ip-172.17.3.13-instance_attributes">
-+ <nvpair id="ip-172.17.3.13-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/>
-+ <nvpair id="ip-172.17.3.13-instance_attributes-ip" name="ip" value="172.17.3.13"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="ip-172.17.3.13-monitor-interval-10s" interval="10s" name="monitor" timeout="20s"/>
-+ <op id="ip-172.17.3.13-start-interval-0s" interval="0s" name="start" timeout="20s"/>
-+ <op id="ip-172.17.3.13-stop-interval-0s" interval="0s" name="stop" timeout="20s"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="ocf" id="ip-172.17.4.19" provider="heartbeat" type="IPaddr2">
-+ <instance_attributes id="ip-172.17.4.19-instance_attributes">
-+ <nvpair id="ip-172.17.4.19-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/>
-+ <nvpair id="ip-172.17.4.19-instance_attributes-ip" name="ip" value="172.17.4.19"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="ip-172.17.4.19-monitor-interval-10s" interval="10s" name="monitor" timeout="20s"/>
-+ <op id="ip-172.17.4.19-start-interval-0s" interval="0s" name="start" timeout="20s"/>
-+ <op id="ip-172.17.4.19-stop-interval-0s" interval="0s" name="stop" timeout="20s"/>
-+ </operations>
-+ </primitive>
-+ <bundle id="haproxy-bundle">
-+ <docker image="192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest" network="host" options="--user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS" replicas="3" run-command="/bin/bash /usr/local/bin/kolla_start"/>
-+ <storage>
-+ <storage-mapping id="haproxy-cfg-files" options="ro" source-dir="/var/lib/kolla/config_files/haproxy.json" target-dir="/var/lib/kolla/config_files/config.json"/>
-+ <storage-mapping id="haproxy-cfg-data" options="ro" source-dir="/var/lib/config-data/puppet-generated/haproxy/" target-dir="/var/lib/kolla/config_files/src"/>
-+ <storage-mapping id="haproxy-hosts" options="ro" source-dir="/etc/hosts" target-dir="/etc/hosts"/>
-+ <storage-mapping id="haproxy-localtime" options="ro" source-dir="/etc/localtime" target-dir="/etc/localtime"/>
-+ <storage-mapping id="haproxy-pki-extracted" options="ro" source-dir="/etc/pki/ca-trust/extracted" target-dir="/etc/pki/ca-trust/extracted"/>
-+ <storage-mapping id="haproxy-pki-ca-bundle-crt" options="ro" source-dir="/etc/pki/tls/certs/ca-bundle.crt" target-dir="/etc/pki/tls/certs/ca-bundle.crt"/>
-+ <storage-mapping id="haproxy-pki-ca-bundle-trust-crt" options="ro" source-dir="/etc/pki/tls/certs/ca-bundle.trust.crt" target-dir="/etc/pki/tls/certs/ca-bundle.trust.crt"/>
-+ <storage-mapping id="haproxy-pki-cert" options="ro" source-dir="/etc/pki/tls/cert.pem" target-dir="/etc/pki/tls/cert.pem"/>
-+ <storage-mapping id="haproxy-dev-log" options="rw" source-dir="/dev/log" target-dir="/dev/log"/>
-+ </storage>
-+ </bundle>
-+ <primitive class="systemd" id="openstack-cinder-volume" type="openstack-cinder-volume">
-+ <operations>
-+ <op id="openstack-cinder-volume-monitor-interval-60" interval="60" name="monitor" timeout="100"/>
-+ <op id="openstack-cinder-volume-start-interval-0s" interval="0s" name="start" timeout="200s"/>
-+ <op id="openstack-cinder-volume-stop-interval-0s" interval="0s" name="stop" timeout="200s"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400244e09" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400244e09-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-ipport" name="ipport" value="6230"/>
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="messaging-1"/>
-+ <nvpair id="stonith-fence_ipmilan-525400244e09-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400244e09-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400cdec10" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400cdec10-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-ipport" name="ipport" value="6239"/>
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="messaging-2"/>
-+ <nvpair id="stonith-fence_ipmilan-525400cdec10-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400cdec10-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400c709f7" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400c709f7-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-ipport" name="ipport" value="6240"/>
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="messaging-0"/>
-+ <nvpair id="stonith-fence_ipmilan-525400c709f7-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400c709f7-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400a7f9e0" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-ipport" name="ipport" value="6233"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="database-1"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a7f9e0-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400a7f9e0-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400a25787" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400a25787-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-ipport" name="ipport" value="6234"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="database-2"/>
-+ <nvpair id="stonith-fence_ipmilan-525400a25787-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400a25787-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-5254005ea387" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-5254005ea387-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-ipport" name="ipport" value="6235"/>
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="database-0"/>
-+ <nvpair id="stonith-fence_ipmilan-5254005ea387-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-5254005ea387-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400542c06" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400542c06-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-ipport" name="ipport" value="6236"/>
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="controller-2"/>
-+ <nvpair id="stonith-fence_ipmilan-525400542c06-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400542c06-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400aac413" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400aac413-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-ipport" name="ipport" value="6232"/>
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="controller-1"/>
-+ <nvpair id="stonith-fence_ipmilan-525400aac413-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400aac413-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ <primitive class="stonith" id="stonith-fence_ipmilan-525400498d34" type="fence_ipmilan">
-+ <instance_attributes id="stonith-fence_ipmilan-525400498d34-instance_attributes">
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-ipaddr" name="ipaddr" value="172.16.0.8"/>
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-ipport" name="ipport" value="6231"/>
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-lanplus" name="lanplus" value="true"/>
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-login" name="login" value="admin"/>
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-passwd" name="passwd" value="password"/>
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="controller-0"/>
-+ <nvpair id="stonith-fence_ipmilan-525400498d34-instance_attributes-privlvl" name="privlvl" value="administrator"/>
-+ </instance_attributes>
-+ <operations>
-+ <op id="stonith-fence_ipmilan-525400498d34-monitor-interval-60s" interval="60s" name="monitor"/>
-+ </operations>
-+ </primitive>
-+ </resources>
-+ <constraints>
-+ <rsc_location id="location-rabbitmq-bundle" resource-discovery="exclusive" rsc="rabbitmq-bundle">
-+ <rule id="location-rabbitmq-bundle-rule" score="0">
-+ <expression attribute="rabbitmq-role" id="location-rabbitmq-bundle-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-galera-bundle" resource-discovery="exclusive" rsc="galera-bundle">
-+ <rule id="location-galera-bundle-rule" score="0">
-+ <expression attribute="galera-role" id="location-galera-bundle-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-redis-bundle" resource-discovery="exclusive" rsc="redis-bundle">
-+ <rule id="location-redis-bundle-rule" score="0">
-+ <expression attribute="redis-role" id="location-redis-bundle-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-ip-192.168.24.11" resource-discovery="exclusive" rsc="ip-192.168.24.11">
-+ <rule id="location-ip-192.168.24.11-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-ip-192.168.24.11-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-ip-10.0.0.104" resource-discovery="exclusive" rsc="ip-10.0.0.104">
-+ <rule id="location-ip-10.0.0.104-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-ip-10.0.0.104-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-ip-172.17.1.19" resource-discovery="exclusive" rsc="ip-172.17.1.19">
-+ <rule id="location-ip-172.17.1.19-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-ip-172.17.1.19-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-ip-172.17.1.11" resource-discovery="exclusive" rsc="ip-172.17.1.11">
-+ <rule id="location-ip-172.17.1.11-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-ip-172.17.1.11-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-ip-172.17.3.13" resource-discovery="exclusive" rsc="ip-172.17.3.13">
-+ <rule id="location-ip-172.17.3.13-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-ip-172.17.3.13-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-ip-172.17.4.19" resource-discovery="exclusive" rsc="ip-172.17.4.19">
-+ <rule id="location-ip-172.17.4.19-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-ip-172.17.4.19-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-haproxy-bundle" resource-discovery="exclusive" rsc="haproxy-bundle">
-+ <rule id="location-haproxy-bundle-rule" score="0">
-+ <expression attribute="haproxy-role" id="location-haproxy-bundle-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_order first="ip-192.168.24.11" first-action="start" id="order-ip-192.168.24.11-haproxy-bundle-Optional" kind="Optional" then="haproxy-bundle" then-action="start"/>
-+ <rsc_colocation id="colocation-ip-192.168.24.11-haproxy-bundle-INFINITY" rsc="ip-192.168.24.11" score="INFINITY" with-rsc="haproxy-bundle"/>
-+ <rsc_order first="ip-10.0.0.104" first-action="start" id="order-ip-10.0.0.104-haproxy-bundle-Optional" kind="Optional" then="haproxy-bundle" then-action="start"/>
-+ <rsc_colocation id="colocation-ip-10.0.0.104-haproxy-bundle-INFINITY" rsc="ip-10.0.0.104" score="INFINITY" with-rsc="haproxy-bundle"/>
-+ <rsc_order first="ip-172.17.1.19" first-action="start" id="order-ip-172.17.1.19-haproxy-bundle-Optional" kind="Optional" then="haproxy-bundle" then-action="start"/>
-+ <rsc_colocation id="colocation-ip-172.17.1.19-haproxy-bundle-INFINITY" rsc="ip-172.17.1.19" score="INFINITY" with-rsc="haproxy-bundle"/>
-+ <rsc_order first="ip-172.17.1.11" first-action="start" id="order-ip-172.17.1.11-haproxy-bundle-Optional" kind="Optional" then="haproxy-bundle" then-action="start"/>
-+ <rsc_colocation id="colocation-ip-172.17.1.11-haproxy-bundle-INFINITY" rsc="ip-172.17.1.11" score="INFINITY" with-rsc="haproxy-bundle"/>
-+ <rsc_order first="ip-172.17.3.13" first-action="start" id="order-ip-172.17.3.13-haproxy-bundle-Optional" kind="Optional" then="haproxy-bundle" then-action="start"/>
-+ <rsc_colocation id="colocation-ip-172.17.3.13-haproxy-bundle-INFINITY" rsc="ip-172.17.3.13" score="INFINITY" with-rsc="haproxy-bundle"/>
-+ <rsc_order first="ip-172.17.4.19" first-action="start" id="order-ip-172.17.4.19-haproxy-bundle-Optional" kind="Optional" then="haproxy-bundle" then-action="start"/>
-+ <rsc_colocation id="colocation-ip-172.17.4.19-haproxy-bundle-INFINITY" rsc="ip-172.17.4.19" score="INFINITY" with-rsc="haproxy-bundle"/>
-+ <rsc_location id="location-openstack-cinder-volume" resource-discovery="exclusive" rsc="openstack-cinder-volume">
-+ <rule id="location-openstack-cinder-volume-rule" score="0">
-+ <expression attribute="cinder-volume-role" id="location-openstack-cinder-volume-rule-expr" operation="eq" value="true"/>
-+ </rule>
-+ </rsc_location>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400244e09-messaging-1--INFINITY" node="messaging-1" rsc="stonith-fence_ipmilan-525400244e09" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400cdec10-messaging-2--INFINITY" node="messaging-2" rsc="stonith-fence_ipmilan-525400cdec10" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-5254005ea387-database-0--INFINITY" node="database-0" rsc="stonith-fence_ipmilan-5254005ea387" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400a7f9e0-database-1--INFINITY" node="database-1" rsc="stonith-fence_ipmilan-525400a7f9e0" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400a25787-database-2--INFINITY" node="database-2" rsc="stonith-fence_ipmilan-525400a25787" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400c709f7-messaging-0--INFINITY" node="messaging-0" rsc="stonith-fence_ipmilan-525400c709f7" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400542c06-controller-2--INFINITY" node="controller-2" rsc="stonith-fence_ipmilan-525400542c06" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400aac413-controller-1--INFINITY" node="controller-1" rsc="stonith-fence_ipmilan-525400aac413" score="-INFINITY"/>
-+ <rsc_location id="location-stonith-fence_ipmilan-525400498d34-controller-0--INFINITY" node="controller-0" rsc="stonith-fence_ipmilan-525400498d34" score="-INFINITY"/>
-+ </constraints>
-+ <rsc_defaults>
-+ <meta_attributes id="rsc_defaults-options">
-+ <nvpair id="rsc_defaults-options-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
-+ </meta_attributes>
-+ </rsc_defaults>
-+ </configuration>
-+ <status>
-+ <node_state id="2" uname="controller-1" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
-+ <lrm id="2">
-+ <lrm_resources>
-+ <lrm_resource id="database-0" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-0_last_0" operation_key="database-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="36:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;36:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1512341372" last-rc-change="1512341372" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-1" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-1_last_0" operation_key="database-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="37:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;37:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-2" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-2_last_0" operation_key="database-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="38:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;38:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="3" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-0" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-0_last_0" operation_key="messaging-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;39:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="4" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-1" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-1_last_0" operation_key="messaging-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;40:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-2" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-2_last_0" operation_key="messaging-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="41:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;41:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="6" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="42:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;42:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="7" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="a41ad5f9625676395b163a06987de2d6" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-1" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-1">
-+ <lrm_rsc_op id="rabbitmq-bundle-1_last_0" operation_key="rabbitmq-bundle-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="43:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;43:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="8" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="e25f0ff041ed91bee8ee197d0ce2aebd" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-2" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-2">
-+ <lrm_rsc_op id="rabbitmq-bundle-2_last_0" operation_key="rabbitmq-bundle-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="44:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;44:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="9" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="593e15353c64e73e2efe61415c7dd44b" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-1" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-1">
-+ <lrm_rsc_op id="galera-bundle-1_last_0" operation_key="galera-bundle-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="46:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;46:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="10" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="f6e3b46e18b24f6e1cca9639ec9b7c41" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="49:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;49:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="11" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="dd323696d6c8ed14cb71914c411664c9" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="53:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;53:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="0" queue-time="0" op-digest="f325849fbffe2e62970eb201a50da9f3" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400244e09" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400244e09_last_0" operation_key="stonith-fence_ipmilan-525400244e09_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="64:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;64:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="69" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="118" queue-time="0" op-digest="4d90b1c5011f28a7f26ea6940c3d6047" op-secure-params=" passwd password " op-secure-digest="121bce21cad5e00c48a5c51be26c7522"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400cdec10" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400cdec10_last_0" operation_key="stonith-fence_ipmilan-525400cdec10_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="65:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;65:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="73" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="1" queue-time="0" op-digest="1bbfe3c1bf06a468db7656dd7552c4d6" op-secure-params=" passwd password " op-secure-digest="8d9cf5beca60b2da8b0f7c9a7342a4aa"/>
-+ </lrm_resource>
-+ <lrm_resource id="openstack-cinder-volume" type="openstack-cinder-volume" class="systemd">
-+ <lrm_rsc_op id="openstack-cinder-volume_last_0" operation_key="openstack-cinder-volume_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="63:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;63:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="65" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="155" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="redis-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="48:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;48:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="15" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="418" queue-time="0" op-digest="b6bd1e4fa13216f010a5f4ba18d081a3"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="56:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;56:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="37" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="408" queue-time="0" op-digest="2c46df7582fe8b55e9dcdeaceb4c84c7"/>
-+ </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="52:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;52:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="24" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="432" queue-time="0" op-digest="cdf5d52dbfd265e497dd1dfb06f2faf1"/>
-+ </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="do_update_resource" crm_feature_set="3.0.12" transition-key="62:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;62:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="61" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="417" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </lrm_resource>
-+ <lrm_resource id="haproxy-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="60:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;60:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="53" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="443" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-192.168.24.11" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-192.168.24.11_last_0" operation_key="ip-192.168.24.11_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="54:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;54:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="29" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="481" queue-time="0" op-digest="d16224b1cc961154d457d259d944b5f9"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.3.13" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.3.13_last_0" operation_key="ip-172.17.3.13_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="58:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;58:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="45" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="486" queue-time="0" op-digest="aabfc88ecfd0ef79b36f8958512b0190"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.1.11" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.1.11_last_0" operation_key="ip-172.17.1.11_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="57:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;57:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="41" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="491" queue-time="0" op-digest="7c6ed186ff8cdf7693b51ee42b4fc6e1"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="50:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;50:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="20" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="509" queue-time="1" op-digest="d12a03fcf5794843261e2916fbd6c63b"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-10.0.0.104" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-10.0.0.104_last_0" operation_key="ip-10.0.0.104_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="55:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;55:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="33" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="507" queue-time="0" op-digest="f1d53d03e6223a0e53558dbf6f3bcbea"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.4.19" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.4.19_last_0" operation_key="ip-172.17.4.19_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="59:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;59:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="49" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="528" queue-time="0" op-digest="aa7c6b227cb7ab3004b79cce131be1b3"/>
-+ </lrm_resource>
-+ <lrm_resource id="haproxy-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="61:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;61:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="57" rc-code="7" op-status="0" interval="0" last-run="1512341374" last-rc-change="1512341374" exec-time="536" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400c709f7" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400c709f7_last_0" operation_key="stonith-fence_ipmilan-525400c709f7_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="66:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;66:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="77" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="1a536a915526af43ef48909329afb3b2" op-secure-params=" passwd password " op-secure-digest="79c818a20ab9bdc97f7834f1e78face1"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400a7f9e0" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a7f9e0_last_0" operation_key="stonith-fence_ipmilan-525400a7f9e0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="67:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;67:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="81" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="79027109189cf76473206a064a7297db" op-secure-params=" passwd password " op-secure-digest="324791a6565e672135bd6e0325f2d7ca"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400a25787" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a25787_last_0" operation_key="stonith-fence_ipmilan-525400a25787_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="68:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;68:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="85" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="3b08cb766486ae213950205853288336" op-secure-params=" passwd password " op-secure-digest="b0cbf3a6399393106803cb99269abe06"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-5254005ea387" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-5254005ea387_last_0" operation_key="stonith-fence_ipmilan-5254005ea387_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="69:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;69:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="89" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="9c0b8d3466b167eec30455c361939f0e" op-secure-params=" passwd password " op-secure-digest="14900e2150667678c44f24d73286301c"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400542c06" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400542c06_last_0" operation_key="stonith-fence_ipmilan-525400542c06_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="70:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;70:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="93" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="c29ea7ff58baa575edf9b083d96c8d97" op-secure-params=" passwd password " op-secure-digest="982bf2fb6d049bf379a72647cb6eab0a"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400aac413" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400aac413_last_0" operation_key="stonith-fence_ipmilan-525400aac413_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="71:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;71:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="97" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="b45737bb0d27199c17d938d131074ee5" op-secure-params=" passwd password " op-secure-digest="b47e5b47ba419433c479357326c16b79"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400498d34" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400498d34_last_0" operation_key="stonith-fence_ipmilan-525400498d34_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="72:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;72:14:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-1" call-id="101" rc-code="7" op-status="0" interval="0" last-run="1512341375" last-rc-change="1512341375" exec-time="0" queue-time="0" op-digest="91b8661ac13de0e2114690e4149f3bcd" op-secure-params=" passwd password " op-secure-digest="c9eae91b90ce97ecfdfa17bdee292722"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="2">
-+ <instance_attributes id="status-2">
-+ <nvpair id="status-2-shutdown" name="shutdown" value="0"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state id="1" uname="controller-0" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
-+ <lrm id="1">
-+ <lrm_resources>
-+ <lrm_resource id="database-0" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-0_last_0" operation_key="database-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="50:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;50:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-1" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-1_last_0" operation_key="database-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="51:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;51:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-2" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-2_last_0" operation_key="database-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="52:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;52:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="3" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-0" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-0_last_0" operation_key="messaging-0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="53:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;53:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="4" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-1" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-1_last_0" operation_key="messaging-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="54:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;54:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-2" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-2_last_0" operation_key="messaging-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="55:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;55:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="6" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="56:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;56:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="7" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="a41ad5f9625676395b163a06987de2d6" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-1" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-1">
-+ <lrm_rsc_op id="rabbitmq-bundle-1_last_0" operation_key="rabbitmq-bundle-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="57:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;57:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="8" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="e25f0ff041ed91bee8ee197d0ce2aebd" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-2" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-2">
-+ <lrm_rsc_op id="rabbitmq-bundle-2_last_0" operation_key="rabbitmq-bundle-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="58:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;58:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="9" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="593e15353c64e73e2efe61415c7dd44b" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="59:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;59:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="10" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="dbc6b52d45a75a0b041af92265b22f9e" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-1" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-1">
-+ <lrm_rsc_op id="galera-bundle-1_last_0" operation_key="galera-bundle-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="60:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;60:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="11" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="f6e3b46e18b24f6e1cca9639ec9b7c41" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="61:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;61:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="bf7cf9acd053cee24dc3401862009e40" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="65:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;65:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="13" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="cd98602d6f977947327050913302f861" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="67:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;67:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="14" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="0" queue-time="0" op-digest="f325849fbffe2e62970eb201a50da9f3" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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="66:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;66:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="26" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="39" queue-time="0" op-digest="cdf5d52dbfd265e497dd1dfb06f2faf1"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="64:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;64:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="21" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="42" queue-time="0" op-digest="d12a03fcf5794843261e2916fbd6c63b"/>
-+ </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="173:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;173:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="48" rc-code="0" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="422" queue-time="0" op-digest="b6bd1e4fa13216f010a5f4ba18d081a3"/>
-+ <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="174:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;174:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="98" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340829" exec-time="93" queue-time="0" op-digest="20a4fe5eb550f2b6c20875a81803817e"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="70:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;70:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="39" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="47" queue-time="0" op-digest="2c46df7582fe8b55e9dcdeaceb4c84c7"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.1.11" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.1.11_last_0" operation_key="ip-172.17.1.11_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="71:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;71:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="43" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="48" queue-time="0" op-digest="7c6ed186ff8cdf7693b51ee42b4fc6e1"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-192.168.24.11" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-192.168.24.11_last_0" operation_key="ip-192.168.24.11_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="68:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;68:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="31" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="56" queue-time="0" op-digest="d16224b1cc961154d457d259d944b5f9"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-10.0.0.104" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-10.0.0.104_last_0" operation_key="ip-10.0.0.104_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="69:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;69:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="35" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="58" queue-time="0" op-digest="f1d53d03e6223a0e53558dbf6f3bcbea"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.3.13" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.3.13_last_0" operation_key="ip-172.17.3.13_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="72:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;72:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="47" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="56" queue-time="0" op-digest="aabfc88ecfd0ef79b36f8958512b0190"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400244e09" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400244e09_last_0" operation_key="stonith-fence_ipmilan-525400244e09_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="78:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;78:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="72" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="25" queue-time="0" op-digest="4d90b1c5011f28a7f26ea6940c3d6047" op-secure-params=" passwd password " op-secure-digest="121bce21cad5e00c48a5c51be26c7522"/>
-+ </lrm_resource>
-+ <lrm_resource id="openstack-cinder-volume" type="openstack-cinder-volume" class="systemd">
-+ <lrm_rsc_op id="openstack-cinder-volume_last_0" operation_key="openstack-cinder-volume_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="77:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;77:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="68" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="31" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.4.19" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.4.19_last_0" operation_key="ip-172.17.4.19_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="73:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;73:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="52" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="43" queue-time="0" op-digest="aa7c6b227cb7ab3004b79cce131be1b3"/>
-+ </lrm_resource>
-+ <lrm_resource id="haproxy-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="75:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;75:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="60" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="41" queue-time="1" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </lrm_resource>
-+ <lrm_resource id="haproxy-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="239:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;239:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="97" rc-code="0" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="393" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ <lrm_rsc_op id="haproxy-bundle-docker-0_monitor_60000" operation_key="haproxy-bundle-docker-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="240:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;240:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="108" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340829" exec-time="77" queue-time="0" op-digest="02bacde98cfd7c1daceaf2a3bb4f851c"/>
-+ </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="do_update_resource" crm_feature_set="3.0.12" transition-key="76:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;76:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="64" rc-code="7" op-status="0" interval="0" last-run="1512340828" last-rc-change="1512340828" exec-time="42" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400cdec10" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400cdec10_last_0" operation_key="stonith-fence_ipmilan-525400cdec10_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="79:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;79:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="76" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="1bbfe3c1bf06a468db7656dd7552c4d6" op-secure-params=" passwd password " op-secure-digest="8d9cf5beca60b2da8b0f7c9a7342a4aa"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400c709f7" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400c709f7_last_0" operation_key="stonith-fence_ipmilan-525400c709f7_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="80:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;80:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="80" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="1a536a915526af43ef48909329afb3b2" op-secure-params=" passwd password " op-secure-digest="79c818a20ab9bdc97f7834f1e78face1"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400a25787" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a25787_last_0" operation_key="stonith-fence_ipmilan-525400a25787_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="82:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;82:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="88" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="3b08cb766486ae213950205853288336" op-secure-params=" passwd password " op-secure-digest="b0cbf3a6399393106803cb99269abe06"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-5254005ea387" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-5254005ea387_last_0" operation_key="stonith-fence_ipmilan-5254005ea387_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="83:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;83:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="92" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="9c0b8d3466b167eec30455c361939f0e" op-secure-params=" passwd password " op-secure-digest="14900e2150667678c44f24d73286301c"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400542c06" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400542c06_last_0" operation_key="stonith-fence_ipmilan-525400542c06_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="84:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;84:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="96" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="c29ea7ff58baa575edf9b083d96c8d97" op-secure-params=" passwd password " op-secure-digest="982bf2fb6d049bf379a72647cb6eab0a"/>
-+ </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="175:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;175:1:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="16" rc-code="0" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="dd323696d6c8ed14cb71914c411664c9" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="redis-bundle-0_monitor_60000" operation_key="redis-bundle-0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="143:2:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;143:2:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="17" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340830" exec-time="0" queue-time="0" op-digest="e3ae7972e4989b9b928f3ff082c5ac23"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400aac413" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400aac413_last_0" operation_key="stonith-fence_ipmilan-525400aac413_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="85:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;85:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="103" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="b45737bb0d27199c17d938d131074ee5" op-secure-params=" passwd password " op-secure-digest="b47e5b47ba419433c479357326c16b79"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400498d34" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400498d34_last_0" operation_key="stonith-fence_ipmilan-525400498d34_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="86:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;86:1:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="107" rc-code="7" op-status="0" interval="0" last-run="1512340829" last-rc-change="1512340829" exec-time="0" queue-time="0" op-digest="91b8661ac13de0e2114690e4149f3bcd" op-secure-params=" passwd password " op-secure-digest="c9eae91b90ce97ecfdfa17bdee292722"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400a7f9e0" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a7f9e0_last_0" operation_key="stonith-fence_ipmilan-525400a7f9e0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="226:6:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;226:6:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="114" rc-code="0" op-status="0" interval="0" last-run="1512340954" last-rc-change="1512340954" exec-time="2204" queue-time="0" op-digest="79027109189cf76473206a064a7297db" op-secure-params=" passwd password " op-secure-digest="324791a6565e672135bd6e0325f2d7ca"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a7f9e0_monitor_60000" operation_key="stonith-fence_ipmilan-525400a7f9e0_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="227:6:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;227:6:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="115" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340957" exec-time="2187" queue-time="0" op-digest="8c611b4348c55f057229c740e92e759c" op-secure-params=" passwd password " op-secure-digest="324791a6565e672135bd6e0325f2d7ca"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="1">
-+ <instance_attributes id="status-1">
-+ <nvpair id="status-1-shutdown" name="shutdown" value="0"/>
-+ <nvpair id="status-1-master-redis" name="master-redis" value="1"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state id="3" uname="controller-2" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
-+ <transient_attributes id="3">
-+ <instance_attributes id="status-3">
-+ <nvpair id="status-3-shutdown" name="shutdown" value="0"/>
-+ <nvpair id="status-3-last-failure-stonith-fence_ipmilan-525400a7f9e0" name="last-failure-stonith-fence_ipmilan-525400a7f9e0" value="1512340455"/>
-+ <nvpair id="status-3-master-redis" name="master-redis" value="1"/>
-+ <nvpair id="status-3-fail-count-stonith-fence_ipmilan-525400498d34" name="fail-count-stonith-fence_ipmilan-525400498d34" value="1"/>
-+ <nvpair id="status-3-last-failure-stonith-fence_ipmilan-525400498d34" name="last-failure-stonith-fence_ipmilan-525400498d34" value="1512409184"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="3">
-+ <lrm_resources>
-+ <lrm_resource id="stonith-fence_ipmilan-525400244e09" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400244e09_last_0" operation_key="stonith-fence_ipmilan-525400244e09_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="231:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;231:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="111" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="2160" queue-time="0" op-digest="4d90b1c5011f28a7f26ea6940c3d6047" op-secure-params=" passwd password " op-secure-digest="121bce21cad5e00c48a5c51be26c7522"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400244e09_monitor_60000" operation_key="stonith-fence_ipmilan-525400244e09_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="208:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;208:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="119" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="1095" queue-time="0" op-digest="b6c8a4e65b9d2660ce533a17530ab254" op-secure-params=" passwd password " op-secure-digest="121bce21cad5e00c48a5c51be26c7522"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-5254005ea387" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-5254005ea387_last_0" operation_key="stonith-fence_ipmilan-5254005ea387_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="82:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;82:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="91" rc-code="7" op-status="0" interval="0" last-run="1512340434" last-rc-change="1512340434" exec-time="0" queue-time="0" op-digest="9c0b8d3466b167eec30455c361939f0e" op-secure-params=" passwd password " op-secure-digest="14900e2150667678c44f24d73286301c"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.4.19" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.4.19_last_0" operation_key="ip-172.17.4.19_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="217:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;217:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="116" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="4070" queue-time="0" op-digest="aa7c6b227cb7ab3004b79cce131be1b3"/>
-+ <lrm_rsc_op id="ip-172.17.4.19_monitor_10000" operation_key="ip-172.17.4.19_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="195:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;195:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="118" rc-code="0" op-status="0" interval="10000" last-rc-change="1512340635" exec-time="63" queue-time="0" op-digest="16f17a7b0b49bf2b2abee9fb1c2c1be2"/>
-+ </lrm_resource>
-+ <lrm_resource id="redis-bundle-2" type="remote" class="ocf" provider="pacemaker" container="redis-bundle-docker-2">
-+ <lrm_rsc_op id="redis-bundle-2_last_0" operation_key="redis-bundle-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="182:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;182:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="16" rc-code="0" op-status="0" interval="0" last-run="1512340435" last-rc-change="1512340435" exec-time="0" queue-time="0" op-digest="f325849fbffe2e62970eb201a50da9f3" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="redis-bundle-2_monitor_60000" operation_key="redis-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="151:16355:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;151:16355:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="17" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340456" exec-time="0" queue-time="0" op-digest="1c97595acf862a2449ada08e9770bdf5"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400cdec10" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400cdec10_last_0" operation_key="stonith-fence_ipmilan-525400cdec10_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="234:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;234:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="112" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="1095" queue-time="0" op-digest="1bbfe3c1bf06a468db7656dd7552c4d6" op-secure-params=" passwd password " op-secure-digest="8d9cf5beca60b2da8b0f7c9a7342a4aa"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400cdec10_monitor_60000" operation_key="stonith-fence_ipmilan-525400cdec10_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="211:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;211:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="120" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="1080" queue-time="0" op-digest="7402ab63140561169c7e6bd9e3de52d7" op-secure-params=" passwd password " op-secure-digest="8d9cf5beca60b2da8b0f7c9a7342a4aa"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400498d34" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400498d34_last_0" operation_key="stonith-fence_ipmilan-525400498d34_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="10:1130:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;10:1130:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-2" call-id="131" rc-code="0" op-status="0" interval="0" last-run="1512409184" last-rc-change="1512409184" exec-time="0" queue-time="0" op-digest="91b8661ac13de0e2114690e4149f3bcd" op-secure-params=" passwd password " op-secure-digest="c9eae91b90ce97ecfdfa17bdee292722"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400498d34_monitor_60000" operation_key="stonith-fence_ipmilan-525400498d34_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="227:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;227:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="122" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="1102" queue-time="0" op-digest="7c2d201fd7b35d63223b518e4ec37f5a" op-secure-params=" passwd password " op-secure-digest="c9eae91b90ce97ecfdfa17bdee292722"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400498d34_last_failure_0" operation_key="stonith-fence_ipmilan-525400498d34_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="227:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="4:1;227:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="122" rc-code="1" op-status="4" interval="60000" last-rc-change="1512409168" exec-time="15218" queue-time="0" op-digest="7c2d201fd7b35d63223b518e4ec37f5a" op-secure-params=" passwd password " op-secure-digest="c9eae91b90ce97ecfdfa17bdee292722"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400aac413" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400aac413_last_0" operation_key="stonith-fence_ipmilan-525400aac413_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="252:16366:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;252:16366:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="123" rc-code="0" op-status="0" interval="0" last-run="1512340746" last-rc-change="1512340746" exec-time="2135" queue-time="0" op-digest="b45737bb0d27199c17d938d131074ee5" op-secure-params=" passwd password " op-secure-digest="b47e5b47ba419433c479357326c16b79"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400aac413_monitor_60000" operation_key="stonith-fence_ipmilan-525400aac413_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="233:16367:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;233:16367:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="124" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340778" exec-time="2135" queue-time="1" op-digest="519d5717cf4b9586e958e89620a86288" op-secure-params=" passwd password " op-secure-digest="b47e5b47ba419433c479357326c16b79"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="62:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;62:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="13" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="0" queue-time="0" op-digest="dd323696d6c8ed14cb71914c411664c9" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="64:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;64:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="14" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="0" queue-time="0" op-digest="cd98602d6f977947327050913302f861" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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="build_active_RAs" crm_feature_set="3.0.12" transition-key="80:16366:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;80:16366:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="31" rc-code="0" op-status="0" interval="0" last-run="1512340746" last-rc-change="1512340746" exec-time="0" queue-time="0" op-digest="a41ad5f9625676395b163a06987de2d6" 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="build_active_RAs" crm_feature_set="3.0.12" transition-key="65:16367:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;65:16367:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="33" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340778" exec-time="0" queue-time="0" op-digest="f09b3fbf8a04a3ab4bdb3fed5870adae"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-1" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-1">
-+ <lrm_rsc_op id="rabbitmq-bundle-1_last_0" operation_key="rabbitmq-bundle-1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="83:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;83:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="21" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="0" queue-time="0" op-digest="e25f0ff041ed91bee8ee197d0ce2aebd" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="rabbitmq-bundle-1_monitor_60000" operation_key="rabbitmq-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="61:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;61:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="27" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="0" queue-time="0" op-digest="006c72e63b78b05f1a9175b74f27325a"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-2" type="remote" class="ocf" provider="pacemaker" container="rabbitmq-bundle-docker-2">
-+ <lrm_rsc_op id="rabbitmq-bundle-2_last_0" operation_key="rabbitmq-bundle-2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="88:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;88:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="22" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="0" queue-time="0" op-digest="593e15353c64e73e2efe61415c7dd44b" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="rabbitmq-bundle-2_monitor_60000" operation_key="rabbitmq-bundle-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="66:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;66:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="28" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="0" queue-time="0" op-digest="79276e73b8cca5be7d8bcb4332451faf"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-0" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-0_last_0" operation_key="messaging-0_migrate_from_0" operation="migrate_from" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="72:16366:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;72:16366:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="30" rc-code="0" op-status="0" interval="0" last-run="1512340746" last-rc-change="1512340746" exec-time="0" queue-time="0" migrate_source="controller-0" migrate_target="controller-2" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="messaging-0_monitor_20000" operation_key="messaging-0_monitor_20000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="56:16367:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;56:16367:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="32" rc-code="0" op-status="0" interval="20000" last-rc-change="1512340778" exec-time="0" queue-time="0" op-digest="6e5bb737f46c381d8a46fb4162afd9e0"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-1" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-1_last_0" operation_key="messaging-1_migrate_from_0" operation="migrate_from" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="70:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;70:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="0" queue-time="0" migrate_source="controller-1" migrate_target="controller-2" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="messaging-1_monitor_20000" operation_key="messaging-1_monitor_20000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="68:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;68:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="25" rc-code="0" op-status="0" interval="20000" last-rc-change="1512340630" exec-time="0" queue-time="0" op-digest="6e5bb737f46c381d8a46fb4162afd9e0"/>
-+ </lrm_resource>
-+ <lrm_resource id="messaging-2" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="messaging-2_last_0" operation_key="messaging-2_migrate_from_0" operation="migrate_from" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="75:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;75:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="20" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="0" queue-time="0" migrate_source="controller-1" migrate_target="controller-2" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="messaging-2_monitor_20000" operation_key="messaging-2_monitor_20000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="73:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;73:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="26" rc-code="0" op-status="0" interval="20000" last-rc-change="1512340630" exec-time="0" queue-time="0" op-digest="6e5bb737f46c381d8a46fb4162afd9e0"/>
-+ </lrm_resource>
-+ <lrm_resource id="haproxy-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="haproxy-bundle-docker-0_last_0" operation_key="haproxy-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="73:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;73:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="55" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="59" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </lrm_resource>
-+ <lrm_resource id="haproxy-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="haproxy-bundle-docker-1_last_0" operation_key="haproxy-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="74:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;74:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="59" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="59" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ </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="build_active_RAs" crm_feature_set="3.0.12" transition-key="242:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;242:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="105" rc-code="0" op-status="0" interval="0" last-run="1512340434" last-rc-change="1512340434" exec-time="467" queue-time="0" op-digest="083d0ea9c147277510859fd504bf65e4"/>
-+ <lrm_rsc_op id="haproxy-bundle-docker-2_monitor_60000" operation_key="haproxy-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="243:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;243:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="107" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340435" exec-time="88" queue-time="0" op-digest="02bacde98cfd7c1daceaf2a3bb4f851c"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-10.0.0.104" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-10.0.0.104_last_0" operation_key="ip-10.0.0.104_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="68:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;68:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="35" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="89" queue-time="0" op-digest="f1d53d03e6223a0e53558dbf6f3bcbea"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.3.13" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.3.13_last_0" operation_key="ip-172.17.3.13_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="71:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;71:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="47" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="83" queue-time="1" op-digest="aabfc88ecfd0ef79b36f8958512b0190"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400c709f7" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400c709f7_last_0" operation_key="stonith-fence_ipmilan-525400c709f7_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="79:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;79:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="79" rc-code="7" op-status="0" interval="0" last-run="1512340434" last-rc-change="1512340434" exec-time="0" queue-time="0" op-digest="1a536a915526af43ef48909329afb3b2" op-secure-params=" passwd password " op-secure-digest="79c818a20ab9bdc97f7834f1e78face1"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400a25787" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a25787_last_0" operation_key="stonith-fence_ipmilan-525400a25787_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="240:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;240:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="113" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="1095" queue-time="0" op-digest="3b08cb766486ae213950205853288336" op-secure-params=" passwd password " op-secure-digest="b0cbf3a6399393106803cb99269abe06"/>
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a25787_monitor_60000" operation_key="stonith-fence_ipmilan-525400a25787_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="217:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;217:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="121" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="1103" queue-time="0" op-digest="1cadaa04d411d74a4e55ea3f387d0a3b" op-secure-params=" passwd password " op-secure-digest="b0cbf3a6399393106803cb99269abe06"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400a7f9e0" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400a7f9e0_last_0" operation_key="stonith-fence_ipmilan-525400a7f9e0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="57:6:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:7;57:6:7:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-2" call-id="129" rc-code="7" op-status="0" interval="0" last-run="1512340954" last-rc-change="1512340954" exec-time="0" queue-time="0" op-digest="79027109189cf76473206a064a7297db" op-secure-params=" passwd password " op-secure-digest="324791a6565e672135bd6e0325f2d7ca"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="58:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;58:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="10" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="0" queue-time="0" op-digest="dbc6b52d45a75a0b041af92265b22f9e" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-1" type="remote" class="ocf" provider="pacemaker" container="galera-bundle-docker-1">
-+ <lrm_rsc_op id="galera-bundle-1_last_0" operation_key="galera-bundle-1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="119:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;119:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="23" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="0" queue-time="0" op-digest="f6e3b46e18b24f6e1cca9639ec9b7c41" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="galera-bundle-1_monitor_60000" operation_key="galera-bundle-1_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="97:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;97:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="29" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340635" exec-time="0" queue-time="0" op-digest="ae45df88a5aa8e68160cbb0faee9cc78"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="60:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;60:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="0" queue-time="0" op-digest="bf7cf9acd053cee24dc3401862009e40" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="stonith-fence_ipmilan-525400542c06" type="fence_ipmilan" class="stonith">
-+ <lrm_rsc_op id="stonith-fence_ipmilan-525400542c06_last_0" operation_key="stonith-fence_ipmilan-525400542c06_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="83:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;83:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="96" rc-code="7" op-status="0" interval="0" last-run="1512340434" last-rc-change="1512340434" exec-time="0" queue-time="0" op-digest="c29ea7ff58baa575edf9b083d96c8d97" op-secure-params=" passwd password " op-secure-digest="982bf2fb6d049bf379a72647cb6eab0a"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-192.168.24.11" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-192.168.24.11_last_0" operation_key="ip-192.168.24.11_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="67:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;67:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="31" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="90" queue-time="0" op-digest="d16224b1cc961154d457d259d944b5f9"/>
-+ </lrm_resource>
-+ <lrm_resource id="redis-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="redis-bundle-docker-0_last_0" operation_key="redis-bundle-docker-0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="61:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;61:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="17" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="35" queue-time="0" op-digest="b6bd1e4fa13216f010a5f4ba18d081a3"/>
-+ </lrm_resource>
-+ <lrm_resource id="ip-172.17.1.11" type="IPaddr2" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="ip-172.17.1.11_last_0" operation_key="ip-172.17.1.11_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="70:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;70:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="43" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="86" queue-time="0" op-digest="7c6ed186ff8cdf7693b51ee42b4fc6e1"/>
-+ </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="180:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;180:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="92" rc-code="0" op-status="0" interval="0" last-run="1512340434" last-rc-change="1512340434" exec-time="486" queue-time="0" op-digest="cdf5d52dbfd265e497dd1dfb06f2faf1"/>
-+ <lrm_rsc_op id="redis-bundle-docker-2_monitor_60000" operation_key="redis-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="181:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;181:16353:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="108" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340435" exec-time="85" queue-time="0" op-digest="4482b2a3082df72156f22666721ee018"/>
-+ </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_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="63:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;63:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="22" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="44" queue-time="0" op-digest="d12a03fcf5794843261e2916fbd6c63b"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-0" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-0_last_0" operation_key="database-0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="49:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;49:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="1" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-1" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-1_last_0" operation_key="database-1_migrate_from_0" operation="migrate_from" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="61:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;61:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="18" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="0" queue-time="0" migrate_source="controller-1" migrate_target="controller-2" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ <lrm_rsc_op id="database-1_monitor_20000" operation_key="database-1_monitor_20000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="59:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;59:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="24" rc-code="0" op-status="0" interval="20000" last-rc-change="1512340630" exec-time="0" queue-time="0" op-digest="6e5bb737f46c381d8a46fb4162afd9e0"/>
-+ </lrm_resource>
-+ <lrm_resource id="database-2" type="remote" class="ocf" provider="pacemaker">
-+ <lrm_rsc_op id="database-2_last_0" operation_key="database-2_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="51:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;51:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="3" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="0" queue-time="0" op-digest="a48beba1b11f09d6b1c15da8db5bb0a2" op-force-restart=" server " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </lrm_resource>
-+ <lrm_resource id="openstack-cinder-volume" type="openstack-cinder-volume" class="systemd">
-+ <lrm_rsc_op id="openstack-cinder-volume_last_0" operation_key="openstack-cinder-volume_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="76:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;76:16353:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="67" rc-code="7" op-status="0" interval="0" last-run="1512340433" last-rc-change="1512340433" exec-time="60" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-+ </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="210:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;210:16359:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="115" rc-code="0" op-status="0" interval="0" last-run="1512340629" last-rc-change="1512340629" exec-time="4074" queue-time="0" op-digest="2c46df7582fe8b55e9dcdeaceb4c84c7"/>
-+ <lrm_rsc_op id="ip-172.17.1.19_monitor_10000" operation_key="ip-172.17.1.19_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.12" transition-key="188:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;188:16360:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="117" rc-code="0" op-status="0" interval="10000" last-rc-change="1512340635" exec-time="42" queue-time="0" op-digest="1aa0805e76d86953238cd18a51b57487"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="database-0" uname="database-0" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <transient_attributes id="database-0">
-+ <instance_attributes id="status-database-0">
-+ <nvpair id="status-database-0-master-galera" name="master-galera" value="100"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="database-0">
-+ <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="50:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;50:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13110" rc-code="0" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="80" queue-time="0" op-digest="ed7e84d41c6aedf055e8c2d9ca23355d"/>
-+ <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="50:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;50:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13110" rc-code="0" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="80" queue-time="0" op-digest="ed7e84d41c6aedf055e8c2d9ca23355d"/>
-+ <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="117:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;117:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13120" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340233" exec-time="84" queue-time="1" op-digest="47d23461e235e733db55f81b8b33a5c5"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="51:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;51:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13114" rc-code="7" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="31" queue-time="0" op-digest="14385e7ff7b4fcd7e4d11755b3ad0c94"/>
-+ </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="52:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;52:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13118" rc-code="7" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="29" queue-time="0" op-digest="b338eb1889737523521461347b98b88a"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="messaging-0" uname="messaging-0" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <transient_attributes id="messaging-0">
-+ <instance_attributes id="status-messaging-0">
-+ <nvpair id="status-messaging-0-rmq-node-attr-rabbitmq" name="rmq-node-attr-rabbitmq" value="rabbit@messaging-0"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="messaging-0">
-+ <lrm_resources>
-+ <lrm_resource id="rabbitmq-bundle-docker-0" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-0_last_failure_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="59:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;59:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13141" rc-code="0" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="92" queue-time="1" op-digest="91337b9335bcb7351857d25c1cf3d392"/>
-+ <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="59:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;59:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13141" rc-code="0" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="92" queue-time="1" op-digest="91337b9335bcb7351857d25c1cf3d392"/>
-+ <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="80:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;80:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13151" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340233" exec-time="83" queue-time="0" op-digest="761356432321d7bc8da634ff67896f4a"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="60:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;60:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13145" rc-code="7" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="35" queue-time="0" op-digest="b59f3520d7d5f770ece284f4ab68291b"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="61:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;61:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-0" call-id="13149" rc-code="7" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="34" queue-time="0" op-digest="7f41de83a371741e06e17d6c96a008a7"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="database-1" uname="database-1" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <transient_attributes id="database-1">
-+ <instance_attributes id="status-database-1">
-+ <nvpair id="status-database-1-master-galera" name="master-galera" value="100"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="database-1">
-+ <lrm_resources>
-+ <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="53:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;53:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13942" rc-code="7" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="39" queue-time="0" op-digest="ed7e84d41c6aedf055e8c2d9ca23355d"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera-bundle-docker-1_last_failure_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="54:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;54:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13946" rc-code="0" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="82" queue-time="0" op-digest="14385e7ff7b4fcd7e4d11755b3ad0c94"/>
-+ <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="54:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;54:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13946" rc-code="0" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="82" queue-time="0" op-digest="14385e7ff7b4fcd7e4d11755b3ad0c94"/>
-+ <lrm_rsc_op id="galera-bundle-docker-1_monitor_60000" operation_key="galera-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="122:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;122:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13951" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340233" exec-time="86" queue-time="0" op-digest="59fb532a17dc4de0d7c6984a4a9fbce7"/>
-+ </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="55:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;55:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13950" rc-code="7" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="29" queue-time="0" op-digest="b338eb1889737523521461347b98b88a"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="database-2" uname="database-2" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <transient_attributes id="database-2">
-+ <instance_attributes id="status-database-2">
-+ <nvpair id="status-database-2-master-galera" name="master-galera" value="100"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="database-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_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="56:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;56:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="9925" rc-code="7" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="32" queue-time="1" op-digest="ed7e84d41c6aedf055e8c2d9ca23355d"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera-bundle-docker-1_last_0" operation_key="galera-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="57:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;57:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="9929" rc-code="7" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="29" queue-time="0" op-digest="14385e7ff7b4fcd7e4d11755b3ad0c94"/>
-+ </lrm_resource>
-+ <lrm_resource id="galera-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera-bundle-docker-2_last_failure_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="58:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;58:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="9933" rc-code="0" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="91" queue-time="0" op-digest="b338eb1889737523521461347b98b88a"/>
-+ <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="58:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;58:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="9933" rc-code="0" op-status="0" interval="0" last-run="1512340229" last-rc-change="1512340229" exec-time="91" queue-time="0" op-digest="b338eb1889737523521461347b98b88a"/>
-+ <lrm_rsc_op id="galera-bundle-docker-2_monitor_60000" operation_key="galera-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="127:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;127:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="9934" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340233" exec-time="82" queue-time="0" op-digest="d69e833791e20b938e2c63f2e2e57ed2"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="messaging-2" uname="messaging-2" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <transient_attributes id="messaging-2">
-+ <instance_attributes id="status-messaging-2">
-+ <nvpair id="status-messaging-2-rmq-node-attr-rabbitmq" name="rmq-node-attr-rabbitmq" value="rabbit@messaging-2"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="messaging-2">
-+ <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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="65:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;65:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="13666" rc-code="7" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="33" queue-time="0" op-digest="91337b9335bcb7351857d25c1cf3d392"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_0" operation_key="rabbitmq-bundle-docker-1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="66:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;66:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="13670" rc-code="7" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="31" queue-time="0" op-digest="b59f3520d7d5f770ece284f4ab68291b"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_failure_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="67:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;67:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="13674" rc-code="0" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="78" queue-time="0" op-digest="7f41de83a371741e06e17d6c96a008a7"/>
-+ <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="67:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;67:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="13674" rc-code="0" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="78" queue-time="0" op-digest="7f41de83a371741e06e17d6c96a008a7"/>
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-2_monitor_60000" operation_key="rabbitmq-bundle-docker-2_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="90:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;90:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="13675" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340233" exec-time="91" queue-time="0" op-digest="5319266a2fe53465b1122352efb6aa5c"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="messaging-1" uname="messaging-1" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <transient_attributes id="messaging-1">
-+ <instance_attributes id="status-messaging-1">
-+ <nvpair id="status-messaging-1-rmq-node-attr-rabbitmq" name="rmq-node-attr-rabbitmq" value="rabbit@messaging-1"/>
-+ </instance_attributes>
-+ </transient_attributes>
-+ <lrm id="messaging-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_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="62:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;62:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13935" rc-code="7" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="36" queue-time="0" op-digest="91337b9335bcb7351857d25c1cf3d392"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-docker-1" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-1_last_failure_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="63:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;63:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13939" rc-code="0" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="82" queue-time="0" op-digest="b59f3520d7d5f770ece284f4ab68291b"/>
-+ <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="63:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;63:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13939" rc-code="0" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="82" queue-time="0" op-digest="b59f3520d7d5f770ece284f4ab68291b"/>
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-1_monitor_60000" operation_key="rabbitmq-bundle-docker-1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="85:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;85:16342:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13944" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340233" exec-time="88" queue-time="0" op-digest="f8c3faf3117dbe6901f69d517a8a7f78"/>
-+ </lrm_resource>
-+ <lrm_resource id="rabbitmq-bundle-docker-2" type="docker" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq-bundle-docker-2_last_0" operation_key="rabbitmq-bundle-docker-2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="64:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:7;64:16341:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="13943" rc-code="7" op-status="0" interval="0" last-run="1512340228" last-rc-change="1512340228" exec-time="32" queue-time="0" op-digest="7f41de83a371741e06e17d6c96a008a7"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ </node_state>
-+ <node_state remote_node="true" id="redis-bundle-0" uname="redis-bundle-0" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="redis-bundle-0">
-+ <lrm_resources>
-+ <lrm_resource id="redis" type="redis" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="redis_last_0" operation_key="redis_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="163:2:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" transition-magic="0:0;163:2:0:eb31bf05-9ee9-4a86-a2a2-c9729b835413" on_node="controller-0" call-id="8" rc-code="0" op-status="0" interval="0" last-run="1512340830" last-rc-change="1512340830" exec-time="4400" queue-time="0" op-digest="a5b2a4f5c557278af14d6cbffc5a229d" op-secure-params=" user " op-secure-digest="a5b2a4f5c557278af14d6cbffc5a229d"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="redis-bundle-0">
-+ <instance_attributes id="status-redis-bundle-0"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="redis-bundle-2" uname="redis-bundle-2" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="redis-bundle-2">
-+ <lrm_resources>
-+ <lrm_resource id="redis" type="redis" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="redis_last_0" operation_key="redis_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="163:16355:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;163:16355:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="8" rc-code="0" op-status="0" interval="0" last-run="1512340456" last-rc-change="1512340456" exec-time="4408" queue-time="0" op-digest="a5b2a4f5c557278af14d6cbffc5a229d" op-secure-params=" user " op-secure-digest="a5b2a4f5c557278af14d6cbffc5a229d"/>
-+ <lrm_rsc_op id="redis_monitor_60000" operation_key="redis_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="164:16356:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;164:16356:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="52" rc-code="0" op-status="0" interval="60000" last-rc-change="1512340461" exec-time="573" queue-time="0" op-digest="992feffd37882eb5ce9bfc847b2fa75e" op-secure-params=" user " op-secure-digest="a5b2a4f5c557278af14d6cbffc5a229d"/>
-+ <lrm_rsc_op id="redis_monitor_45000" operation_key="redis_monitor_45000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="163:16356:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;163:16356:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="53" rc-code="0" op-status="0" interval="45000" last-rc-change="1512340462" exec-time="931" queue-time="533" op-digest="992feffd37882eb5ce9bfc847b2fa75e" op-secure-params=" user " op-secure-digest="a5b2a4f5c557278af14d6cbffc5a229d"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="redis-bundle-2">
-+ <instance_attributes id="status-redis-bundle-2"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="redis-bundle-1" uname="redis-bundle-1" in_ccm="false" crm-debug-origin="do_state_transition" node_fenced="0"/>
-+ <node_state remote_node="true" id="rabbitmq-bundle-0" uname="rabbitmq-bundle-0" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="rabbitmq-bundle-0">
-+ <lrm_resources>
-+ <lrm_resource id="rabbitmq" type="rabbitmq-cluster" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq_last_failure_0" operation_key="rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="42:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;42:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="248695" rc-code="0" op-status="0" interval="0" last-run="1512340778" last-rc-change="1512340778" exec-time="3589" queue-time="0" op-digest="780d433233eb4f94c1a151623d002e84"/>
-+ <lrm_rsc_op id="rabbitmq_last_0" operation_key="rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="42:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;42:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="248695" rc-code="0" op-status="0" interval="0" last-run="1512340778" last-rc-change="1512340778" exec-time="3589" queue-time="0" op-digest="780d433233eb4f94c1a151623d002e84"/>
-+ <lrm_rsc_op id="rabbitmq_monitor_10000" operation_key="rabbitmq_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="80:16368:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;80:16368:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="248714" rc-code="0" op-status="0" interval="10000" last-rc-change="1512340787" exec-time="3644" queue-time="0" op-digest="6b46cdf9111345cbd0460b2540d3b2c7"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="rabbitmq-bundle-0">
-+ <instance_attributes id="status-rabbitmq-bundle-0"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="rabbitmq-bundle-1" uname="rabbitmq-bundle-1" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="rabbitmq-bundle-1">
-+ <lrm_resources>
-+ <lrm_resource id="rabbitmq" type="rabbitmq-cluster" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq_last_failure_0" operation_key="rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;39:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="328610" rc-code="0" op-status="0" interval="0" last-run="1512340634" last-rc-change="1512340634" exec-time="3669" queue-time="0" op-digest="780d433233eb4f94c1a151623d002e84"/>
-+ <lrm_rsc_op id="rabbitmq_last_0" operation_key="rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="39:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;39:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="328610" rc-code="0" op-status="0" interval="0" last-run="1512340634" last-rc-change="1512340634" exec-time="3669" queue-time="0" op-digest="780d433233eb4f94c1a151623d002e84"/>
-+ <lrm_rsc_op id="rabbitmq_monitor_10000" operation_key="rabbitmq_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="79:16361:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;79:16361:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="328629" rc-code="0" op-status="0" interval="10000" last-rc-change="1512340645" exec-time="3890" queue-time="0" op-digest="6b46cdf9111345cbd0460b2540d3b2c7"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="rabbitmq-bundle-1">
-+ <instance_attributes id="status-rabbitmq-bundle-1"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="rabbitmq-bundle-2" uname="rabbitmq-bundle-2" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="rabbitmq-bundle-2">
-+ <lrm_resources>
-+ <lrm_resource id="rabbitmq" type="rabbitmq-cluster" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="rabbitmq_last_failure_0" operation_key="rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;40:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="260210" rc-code="0" op-status="0" interval="0" last-run="1512340635" last-rc-change="1512340635" exec-time="3732" queue-time="0" op-digest="780d433233eb4f94c1a151623d002e84"/>
-+ <lrm_rsc_op id="rabbitmq_last_0" operation_key="rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;40:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="260210" rc-code="0" op-status="0" interval="0" last-run="1512340635" last-rc-change="1512340635" exec-time="3732" queue-time="0" op-digest="780d433233eb4f94c1a151623d002e84"/>
-+ <lrm_rsc_op id="rabbitmq_monitor_10000" operation_key="rabbitmq_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="82:16361:0:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:0;82:16361:0:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="260229" rc-code="0" op-status="0" interval="10000" last-rc-change="1512340645" exec-time="3859" queue-time="0" op-digest="6b46cdf9111345cbd0460b2540d3b2c7"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="rabbitmq-bundle-2">
-+ <instance_attributes id="status-rabbitmq-bundle-2"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="galera-bundle-0" uname="galera-bundle-0" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="galera-bundle-0">
-+ <lrm_resources>
-+ <lrm_resource id="galera" type="galera" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera_last_failure_0" operation_key="galera_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;40:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="4040" rc-code="8" op-status="0" interval="0" last-run="1512340778" last-rc-change="1512340778" exec-time="667" queue-time="0" op-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ <lrm_rsc_op id="galera_last_0" operation_key="galera_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="40:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;40:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="4040" rc-code="8" op-status="0" interval="0" last-run="1512340778" last-rc-change="1512340778" exec-time="667" queue-time="0" op-digest="54ae66ac8c91c3dc2b73e1ea256393e1" op-secure-params=" user " op-secure-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ <lrm_rsc_op id="galera_monitor_10000" operation_key="galera_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="117:16368:8:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;117:16368:8:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="4051" rc-code="8" op-status="0" interval="10000" last-rc-change="1512340787" exec-time="338" queue-time="0" op-digest="1698dd48f1fe54ed898160a0139cf835" op-secure-params=" user " op-secure-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="galera-bundle-0">
-+ <instance_attributes id="status-galera-bundle-0"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="galera-bundle-1" uname="galera-bundle-1" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="galera-bundle-1">
-+ <lrm_resources>
-+ <lrm_resource id="galera" type="galera" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera_last_failure_0" operation_key="galera_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="38:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;38:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="3858" rc-code="8" op-status="0" interval="0" last-run="1512340635" last-rc-change="1512340635" exec-time="1231" queue-time="0" op-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ <lrm_rsc_op id="galera_last_0" operation_key="galera_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="38:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;38:16360:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="3858" rc-code="8" op-status="0" interval="0" last-run="1512340635" last-rc-change="1512340635" exec-time="1231" queue-time="0" op-digest="54ae66ac8c91c3dc2b73e1ea256393e1" op-secure-params=" user " op-secure-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ <lrm_rsc_op id="galera_monitor_10000" operation_key="galera_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="119:16361:8:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;119:16361:8:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-2" call-id="3869" rc-code="8" op-status="0" interval="10000" last-rc-change="1512340646" exec-time="343" queue-time="0" op-digest="1698dd48f1fe54ed898160a0139cf835" op-secure-params=" user " op-secure-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="galera-bundle-1">
-+ <instance_attributes id="status-galera-bundle-1"/>
-+ </transient_attributes>
-+ </node_state>
-+ <node_state remote_node="true" id="galera-bundle-2" uname="galera-bundle-2" in_ccm="true" crm-debug-origin="do_state_transition" node_fenced="0">
-+ <lrm id="galera-bundle-2">
-+ <lrm_resources>
-+ <lrm_resource id="galera" type="galera" class="ocf" provider="heartbeat">
-+ <lrm_rsc_op id="galera_last_failure_0" operation_key="galera_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="41:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;41:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="3480" rc-code="8" op-status="0" interval="0" last-run="1512340778" last-rc-change="1512340778" exec-time="1060" queue-time="0" op-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ <lrm_rsc_op id="galera_last_0" operation_key="galera_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="41:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;41:16367:7:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="3480" rc-code="8" op-status="0" interval="0" last-run="1512340778" last-rc-change="1512340778" exec-time="1060" queue-time="0" op-digest="54ae66ac8c91c3dc2b73e1ea256393e1" op-secure-params=" user " op-secure-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ <lrm_rsc_op id="galera_monitor_10000" operation_key="galera_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.12" transition-key="126:16368:8:e146b395-5d9c-4cf5-9590-12e56c48a012" transition-magic="0:8;126:16368:8:e146b395-5d9c-4cf5-9590-12e56c48a012" on_node="controller-1" call-id="3491" rc-code="8" op-status="0" interval="10000" last-rc-change="1512340787" exec-time="329" queue-time="1" op-digest="1698dd48f1fe54ed898160a0139cf835" op-secure-params=" user " op-secure-digest="54ae66ac8c91c3dc2b73e1ea256393e1"/>
-+ </lrm_resource>
-+ </lrm_resources>
-+ </lrm>
-+ <transient_attributes id="galera-bundle-2">
-+ <instance_attributes id="status-galera-bundle-2"/>
-+ </transient_attributes>
-+ </node_state>
-+ </status>
-+</cib>
---
-1.8.3.1
-
-
-From 47a5f6f5cd1fba2c6bac140329e563abd34b2ef4 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 8 Dec 2017 16:54:07 -0600
-Subject: [PATCH 13/16] Low: PE: correct mispelled constant
-
-original intention of 2b1aae07
----
- pengine/allocate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pengine/allocate.c b/pengine/allocate.c
-index 1c95e97..481a0ec 100644
---- a/pengine/allocate.c
-+++ b/pengine/allocate.c
-@@ -1870,7 +1870,7 @@ apply_container_ordering(action_t *action, pe_working_set_t *data_set)
- container->id);
-
- if (safe_str_eq(action->task, CRMD_ACTION_MIGRATE)
-- || safe_str_eq(action->task, CRMD_ACTION_MIGRATE)) {
-+ || safe_str_eq(action->task, CRMD_ACTION_MIGRATED)) {
- /* Migration ops map to "no_action", but we need to apply the same
- * ordering as for stop or demote (see get_router_node()).
- */
-@@ -2036,7 +2036,7 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- remote_rsc->id, state2text(state));
-
- if (safe_str_eq(action->task, CRMD_ACTION_MIGRATE)
-- || safe_str_eq(action->task, CRMD_ACTION_MIGRATE)) {
-+ || safe_str_eq(action->task, CRMD_ACTION_MIGRATED)) {
- /* Migration ops map to "no_action", but we need to apply the same
- * ordering as for stop or demote (see get_router_node()).
- */
---
-1.8.3.1
-
-
-From 55c9b5ef9c6f531ea808926abaaea5c7c8890dad Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 8 Dec 2017 17:31:23 -0600
-Subject: [PATCH 14/16] Doc: PE: update remote stop ordering comments for
- recent changes
-
----
- pengine/allocate.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/pengine/allocate.c b/pengine/allocate.c
-index 481a0ec..7ae4e02 100644
---- a/pengine/allocate.c
-+++ b/pengine/allocate.c
-@@ -2058,9 +2058,6 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- break;
-
- case stop_rsc:
-- /* Handle special case with remote node where stop actions need to be
-- * ordered after the connection resource starts somewhere else.
-- */
- if(state == remote_state_alive) {
- order_action_then_stop(action, remote_rsc,
- pe_order_implies_first, data_set);
-@@ -2076,14 +2073,18 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- pe_order_implies_first, data_set);
-
- } else if(remote_rsc->next_role == RSC_ROLE_STOPPED) {
-- /* If its not coming back up, better do what we need first */
-+ /* State must be remote_state_unknown or remote_state_stopped.
-+ * Since the connection is not coming back up in this
-+ * transition, stop this resource first.
-+ */
- order_action_then_stop(action, remote_rsc,
- pe_order_implies_first, data_set);
-
- } else {
-- /* Wait for the connection resource to be up and assume everything is as we left it */
-+ /* The connection is going to be started somewhere else, so
-+ * stop this resource after that completes.
-+ */
- order_start_then_action(remote_rsc, action, pe_order_none, data_set);
--
- }
- break;
-
---
-1.8.3.1
-
-
-From 39441fa1dfe625cf00af463269052d4c2dafaa16 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 8 Dec 2017 17:16:55 -0600
-Subject: [PATCH 15/16] Low: libpe_status: limit resource type check to
- primitives
-
----
- lib/pengine/complex.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c
-index d58d6be..86f290c 100644
---- a/lib/pengine/complex.c
-+++ b/lib/pengine/complex.c
-@@ -784,7 +784,9 @@ common_unpack(xmlNode * xml_obj, resource_t ** rsc,
- if(is_set((*rsc)->flags, pe_rsc_fence_device)) {
- value = "quorum";
-
-- } else if (safe_str_eq(crm_element_value((*rsc)->xml, XML_AGENT_ATTR_CLASS), "ocf")
-+ } else if (((*rsc)->variant == pe_native)
-+ && safe_str_eq(crm_element_value((*rsc)->xml, XML_AGENT_ATTR_CLASS),
-+ PCMK_RESOURCE_CLASS_OCF)
- && safe_str_eq(crm_element_value((*rsc)->xml, XML_AGENT_ATTR_PROVIDER), "pacemaker")
- && safe_str_eq(crm_element_value((*rsc)->xml, XML_ATTR_TYPE), "remote")
- ) {
---
-1.8.3.1
-
-
-From 68438917c3b1ed305af6da2acd23454cd777e1d1 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 8 Dec 2017 18:00:12 -0600
-Subject: [PATCH 16/16] Fix: lrmd: always use most recent remote proxy
-
-Any working proxy is sufficient, but the newest connection is the most likely
-to be working. We want to avoid using an old proxy that has failed but whose
-TCP connection has not yet timed out.
----
- lrmd/ipc_proxy.c | 41 +++++++++++++----------------------------
- 1 file changed, 13 insertions(+), 28 deletions(-)
-
-diff --git a/lrmd/ipc_proxy.c b/lrmd/ipc_proxy.c
-index 5d6ab34..4d1ee01 100644
---- a/lrmd/ipc_proxy.c
-+++ b/lrmd/ipc_proxy.c
-@@ -42,7 +42,7 @@ static qb_ipcs_service_t *crmd_ipcs = NULL;
- static qb_ipcs_service_t *stonith_ipcs = NULL;
-
- /* ipc providers == crmd clients connecting from cluster nodes */
--static GHashTable *ipc_providers = NULL;
-+static GList *ipc_providers = NULL;
- /* ipc clients == things like cibadmin, crm_resource, connecting locally */
- static GHashTable *ipc_clients = NULL;
-
-@@ -52,24 +52,14 @@ static GHashTable *ipc_clients = NULL;
- *
- * \return Pointer to a provider if one exists, NULL otherwise
- *
-- * \note Grab the first provider available; any provider will work, and usually
-- * there will be only one. These are client connections originating from a
-- * cluster node's crmd.
-+ * \note Grab the first provider, which is the most recent connection. That way,
-+ * if we haven't yet timed out an old, failed connection, we don't try to
-+ * use it.
- */
- crm_client_t *
- ipc_proxy_get_provider()
- {
-- if (ipc_providers) {
-- GHashTableIter iter;
-- gpointer key = NULL;
-- gpointer value = NULL;
--
-- g_hash_table_iter_init(&iter, ipc_providers);
-- if (g_hash_table_iter_next(&iter, &key, &value)) {
-- return (crm_client_t*)value;
-- }
-- }
-- return NULL;
-+ return ipc_providers? (crm_client_t*) (ipc_providers->data) : NULL;
- }
-
- static int32_t
-@@ -378,10 +368,8 @@ static struct qb_ipcs_service_handlers cib_proxy_callbacks_rw = {
- void
- ipc_proxy_add_provider(crm_client_t *ipc_proxy)
- {
-- if (ipc_providers == NULL) {
-- return;
-- }
-- g_hash_table_insert(ipc_providers, ipc_proxy->id, ipc_proxy);
-+ // Prepending ensures the most recent connection is always first
-+ ipc_providers = g_list_prepend(ipc_providers, ipc_proxy);
- }
-
- void
-@@ -393,11 +381,7 @@ ipc_proxy_remove_provider(crm_client_t *ipc_proxy)
- GList *remove_these = NULL;
- GListPtr gIter = NULL;
-
-- if (ipc_providers == NULL) {
-- return;
-- }
--
-- g_hash_table_remove(ipc_providers, ipc_proxy->id);
-+ ipc_providers = g_list_remove(ipc_providers, ipc_proxy);
-
- g_hash_table_iter_init(&iter, ipc_clients);
- while (g_hash_table_iter_next(&iter, (gpointer *) & key, (gpointer *) & ipc_client)) {
-@@ -413,6 +397,8 @@ ipc_proxy_remove_provider(crm_client_t *ipc_proxy)
-
- for (gIter = remove_these; gIter != NULL; gIter = gIter->next) {
- ipc_client = gIter->data;
-+
-+ // Disconnection callback will free the client here
- qb_ipcs_disconnect(ipc_client->ipcs);
- }
-
-@@ -424,7 +410,6 @@ void
- ipc_proxy_init(void)
- {
- ipc_clients = g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, NULL);
-- ipc_providers = g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, NULL);
-
- cib_ipc_servers_init(&cib_ro,
- &cib_rw,
-@@ -446,10 +431,12 @@ void
- ipc_proxy_cleanup(void)
- {
- if (ipc_providers) {
-- g_hash_table_destroy(ipc_providers);
-+ g_list_free(ipc_providers);
-+ ipc_providers = NULL;
- }
- if (ipc_clients) {
- g_hash_table_destroy(ipc_clients);
-+ ipc_clients = NULL;
- }
- cib_ipc_servers_destroy(cib_ro, cib_rw, cib_shm);
- qb_ipcs_destroy(attrd_ipcs);
-@@ -458,6 +445,4 @@ ipc_proxy_cleanup(void)
- cib_ro = NULL;
- cib_rw = NULL;
- cib_shm = NULL;
-- ipc_providers = NULL;
-- ipc_clients = NULL;
- }
---
-1.8.3.1
-
diff --git a/SOURCES/002-ppc64le.patch b/SOURCES/002-ppc64le.patch
new file mode 100644
index 0000000..bb28909
--- /dev/null
+++ b/SOURCES/002-ppc64le.patch
@@ -0,0 +1,54 @@
+From 46201f029e4a5ac3ba0aaf05cb6df80341729566 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Mon, 30 Jul 2018 14:17:49 -0500
+Subject: [PATCH] Doc: tools: add --help/--version options to ipmiservicelogd
+
+allows ppc64le build when relevant dependencies are installed
+---
+ tools/ipmiservicelogd.c | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/tools/ipmiservicelogd.c b/tools/ipmiservicelogd.c
+index 4f52865..865eae0 100644
+--- a/tools/ipmiservicelogd.c
++++ b/tools/ipmiservicelogd.c
+@@ -253,7 +253,7 @@ getProductName(void)
+ static void
+ con_usage(const char *name, const char *help, void *cb_data)
+ {
+- printf("\n%s%s", name, help);
++ printf("%s\n", help);
+ }
+
+ static void
+@@ -261,7 +261,7 @@ usage(const char *progname)
+ {
+ printf("Usage:\n");
+ printf(" %s <con_parms>\n", progname);
+- printf(" Where <con_parms> is one of:");
++ printf(" Where <con_parms> is one of:\n");
+ ipmi_parse_args_iter_help(con_usage, NULL);
+ }
+
+@@ -550,6 +550,18 @@ main(int argc, char *argv[])
+ /* Initialize the OpenIPMI library. */
+ ipmi_init(os_hnd);
+
++ // Check for pacemaker-standard help and version options
++ if (argc > 1) {
++ for (char **arg = &argv[1]; *arg != NULL; ++arg) {
++ if (!strcmp(*arg, "--help") || !strcmp(*arg, "-?")) {
++ usage(argv[0]);
++ return 0;
++ } else if (!strcmp(*arg, "--version") || !strcmp(*arg, "-$")) {
++ crm_help('$', 0);
++ }
++ }
++ }
++
+ #ifdef COMPLEX
+ rv = ipmi_parse_args2(&curr_arg, argc, argv, &args);
+ if (rv) {
+--
+1.8.3.1
+
diff --git a/SOURCES/003-cleanup.patch b/SOURCES/003-cleanup.patch
deleted file mode 100644
index 6ce9476..0000000
--- a/SOURCES/003-cleanup.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From c2d5c19a863f407a034a63f2877eb5faf7036d59 Mon Sep 17 00:00:00 2001
-From: "Gao,Yan" <ygao@suse.com>
-Date: Fri, 8 Dec 2017 14:47:40 +0100
-Subject: [PATCH 1/2] Refactor: tools: crm_resource - Functionize cleaning up
- resource failures
-
----
- tools/crm_resource.c | 26 ++------------------------
- tools/crm_resource.h | 3 +++
- tools/crm_resource_runtime.c | 36 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 41 insertions(+), 24 deletions(-)
-
-diff --git a/tools/crm_resource.c b/tools/crm_resource.c
-index f93f688..4ddcef4 100644
---- a/tools/crm_resource.c
-+++ b/tools/crm_resource.c
-@@ -1094,31 +1094,9 @@ main(int argc, char **argv)
-
- } else if (rsc_cmd == 'C' && just_errors) {
- crmd_replies_needed = 0;
-- for (xmlNode *xml_op = __xml_first_child(data_set.failed); xml_op != NULL;
-- xml_op = __xml_next(xml_op)) {
--
-- const char *node = crm_element_value(xml_op, XML_ATTR_UNAME);
-- const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
-- const char *task_interval = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
-- const char *resource_name = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
--
-- if(resource_name == NULL) {
-- continue;
-- } else if(host_uname && safe_str_neq(host_uname, node)) {
-- continue;
-- } else if(rsc_id && safe_str_neq(rsc_id, resource_name)) {
-- continue;
-- } else if(operation && safe_str_neq(operation, task)) {
-- continue;
-- } else if(interval && safe_str_neq(interval, task_interval)) {
-- continue;
-- }
-
-- crm_debug("Erasing %s failure for %s (%s detected) on %s",
-- task, rsc->id, resource_name, node);
-- rc = cli_resource_delete(crmd_channel, node, rsc, task,
-- task_interval, &data_set);
-- }
-+ rc = cli_resource_delete_failures(crmd_channel, host_uname, rsc, operation,
-+ interval, &data_set);
-
- if(rsc && (rc == pcmk_ok) && (BE_QUIET == FALSE)) {
- /* Now check XML_RSC_ATTR_TARGET_ROLE and XML_RSC_ATTR_MANAGED */
-diff --git a/tools/crm_resource.h b/tools/crm_resource.h
-index 0b8dd2a..e28c9ef 100644
---- a/tools/crm_resource.h
-+++ b/tools/crm_resource.h
-@@ -76,6 +76,9 @@ int cli_resource_search(resource_t *rsc, const char *requested_name,
- int cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
- resource_t *rsc, const char *operation,
- const char *interval, pe_working_set_t *data_set);
-+int cli_resource_delete_failures(crm_ipc_t *crmd_channel, const char *host_uname,
-+ resource_t *rsc, const char *operation,
-+ const char *interval, pe_working_set_t *data_set);
- int cli_resource_restart(resource_t * rsc, const char *host, int timeout_ms, cib_t * cib);
- int cli_resource_move(resource_t *rsc, const char *rsc_id,
- const char *host_name, cib_t *cib,
-diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
-index ffe4e5d..d250a07 100644
---- a/tools/crm_resource_runtime.c
-+++ b/tools/crm_resource_runtime.c
-@@ -655,6 +655,42 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
- return rc;
- }
-
-+int
-+cli_resource_delete_failures(crm_ipc_t *crmd_channel, const char *host_uname,
-+ resource_t *rsc, const char *operation,
-+ const char *interval, pe_working_set_t *data_set)
-+{
-+ int rc = pcmk_ok;
-+
-+ for (xmlNode *xml_op = __xml_first_child(data_set->failed); xml_op != NULL;
-+ xml_op = __xml_next(xml_op)) {
-+
-+ const char *node = crm_element_value(xml_op, XML_ATTR_UNAME);
-+ const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
-+ const char *task_interval = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
-+ const char *resource_name = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
-+
-+ if(resource_name == NULL) {
-+ continue;
-+ } else if(host_uname && safe_str_neq(host_uname, node)) {
-+ continue;
-+ } else if(rsc->id && safe_str_neq(rsc->id, resource_name)) {
-+ continue;
-+ } else if(operation && safe_str_neq(operation, task)) {
-+ continue;
-+ } else if(interval && safe_str_neq(interval, task_interval)) {
-+ continue;
-+ }
-+
-+ crm_debug("Erasing %s failure for %s (%s detected) on %s",
-+ task, rsc->id, resource_name, node);
-+ rc = cli_resource_delete(crmd_channel, node, rsc, task,
-+ task_interval, data_set);
-+ }
-+
-+ return rc;
-+}
-+
- void
- cli_resource_check(cib_t * cib_conn, resource_t *rsc)
- {
---
-1.8.3.1
-
-
-From 170ec0afcddb01fcfb8c2e8c86bc0e53594a42f9 Mon Sep 17 00:00:00 2001
-From: "Gao,Yan" <ygao@suse.com>
-Date: Fri, 8 Dec 2017 16:22:54 +0100
-Subject: [PATCH 2/2] Fix: tools: crm_resource --cleanup for non-primitive
- resources
-
----
- tools/crm_resource_runtime.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
-index d250a07..1048636 100644
---- a/tools/crm_resource_runtime.c
-+++ b/tools/crm_resource_runtime.c
-@@ -662,6 +662,24 @@ cli_resource_delete_failures(crm_ipc_t *crmd_channel, const char *host_uname,
- {
- int rc = pcmk_ok;
-
-+ if (rsc == NULL) {
-+ return -ENXIO;
-+
-+ } else if (rsc->children) {
-+ GListPtr lpc = NULL;
-+
-+ for (lpc = rsc->children; lpc != NULL; lpc = lpc->next) {
-+ resource_t *child = (resource_t *) lpc->data;
-+
-+ rc = cli_resource_delete_failures(crmd_channel, host_uname, child, operation,
-+ interval, data_set);
-+ if(rc != pcmk_ok) {
-+ return rc;
-+ }
-+ }
-+ return pcmk_ok;
-+ }
-+
- for (xmlNode *xml_op = __xml_first_child(data_set->failed); xml_op != NULL;
- xml_op = __xml_next(xml_op)) {
-
---
-1.8.3.1
-
diff --git a/SOURCES/003-static-analysis.patch b/SOURCES/003-static-analysis.patch
new file mode 100644
index 0000000..d0297d6
--- /dev/null
+++ b/SOURCES/003-static-analysis.patch
@@ -0,0 +1,66 @@
+From 1307b6f238fb7f4cada95f6af02c1a4caae3eb63 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Fri, 3 Aug 2018 18:30:47 -0500
+Subject: [PATCH 1/2] Refactor: scheduler: remove unused variable setting
+
+makes static analysis happy
+---
+ lib/pengine/container.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/pengine/container.c b/lib/pengine/container.c
+index d82948a..1526f37 100644
+--- a/lib/pengine/container.c
++++ b/lib/pengine/container.c
+@@ -780,7 +780,6 @@ container_fix_remote_addr(resource_t *rsc)
+ }
+
+ 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;
+--
+1.8.3.1
+
+
+From 1a95cbae653df8835906314d77e74091f55ab319 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Fri, 3 Aug 2018 18:32:08 -0500
+Subject: [PATCH 2/2] Refactor: libcrmcommon: remove dead code
+
+makes static analysis happy
+---
+ lib/common/iso8601.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/common/iso8601.c b/lib/common/iso8601.c
+index c95fa13..b661fce 100644
+--- a/lib/common/iso8601.c
++++ b/lib/common/iso8601.c
+@@ -1384,7 +1384,7 @@ crm_time_format_hr(const char *format, crm_time_hr_t * hr_dt)
+ {
+ const char *mark_s;
+ int max = 128, scanned_pos = 0, printed_pos = 0, fmt_pos = 0,
+- date_len = 0, nano_digits = 0, fmt_len;
++ date_len = 0, nano_digits = 0;
+ char nano_s[10], date_s[max+1], nanofmt_s[5] = "%", *tmp_fmt_s;
+ struct tm tm;
+ crm_time_t dt;
+@@ -1397,11 +1397,11 @@ crm_time_format_hr(const char *format, crm_time_hr_t * hr_dt)
+ sprintf(nano_s, "%06d000", hr_dt->useconds);
+
+ while ((format[scanned_pos]) != '\0') {
+- fmt_len = 0;
+ mark_s = strchr(&format[scanned_pos], '%');
+ if (mark_s) {
++ int fmt_len = 1;
++
+ fmt_pos = mark_s - format;
+- fmt_len = 1;
+ while ((format[fmt_pos+fmt_len] != '\0') &&
+ (format[fmt_pos+fmt_len] >= '0') &&
+ (format[fmt_pos+fmt_len] <= '9')) {
+--
+1.8.3.1
+
diff --git a/SOURCES/004-cleanup.patch b/SOURCES/004-cleanup.patch
index 3ec7535..9a5a3bc 100644
--- a/SOURCES/004-cleanup.patch
+++ b/SOURCES/004-cleanup.patch
@@ -1,7 +1,165 @@
-From 7a813755269f00d7b815e819636841af991762c0 Mon Sep 17 00:00:00 2001
+From 039b778b07f256dd564171430c5427dfb9489a58 Mon Sep 17 00:00:00 2001
+From: "Gao,Yan" <ygao@suse.com>
+Date: Fri, 8 Dec 2017 14:47:40 +0100
+Subject: [PATCH 1/8] Refactor: tools: crm_resource - Functionize cleaning up
+ resource failures
+
+---
+ tools/crm_resource.c | 26 ++------------------------
+ tools/crm_resource.h | 3 +++
+ tools/crm_resource_runtime.c | 36 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 41 insertions(+), 24 deletions(-)
+
+diff --git a/tools/crm_resource.c b/tools/crm_resource.c
+index 0557892..331adf6 100644
+--- a/tools/crm_resource.c
++++ b/tools/crm_resource.c
+@@ -1103,31 +1103,9 @@ main(int argc, char **argv)
+
+ } else if (rsc_cmd == 'C' && just_errors) {
+ crmd_replies_needed = 0;
+- for (xmlNode *xml_op = __xml_first_child(data_set.failed); xml_op != NULL;
+- xml_op = __xml_next(xml_op)) {
+-
+- const char *node = crm_element_value(xml_op, XML_ATTR_UNAME);
+- const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
+- const char *task_interval = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
+- const char *resource_name = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
+-
+- if(resource_name == NULL) {
+- continue;
+- } else if(host_uname && safe_str_neq(host_uname, node)) {
+- continue;
+- } else if(rsc_id && safe_str_neq(rsc_id, resource_name)) {
+- continue;
+- } else if(operation && safe_str_neq(operation, task)) {
+- continue;
+- } else if(interval && safe_str_neq(interval, task_interval)) {
+- continue;
+- }
+
+- crm_debug("Erasing %s failure for %s (%s detected) on %s",
+- task, rsc->id, resource_name, node);
+- rc = cli_resource_delete(crmd_channel, node, rsc, task,
+- task_interval, &data_set);
+- }
++ rc = cli_resource_delete_failures(crmd_channel, host_uname, rsc, operation,
++ interval, &data_set);
+
+ if(rsc && (rc == pcmk_ok) && (BE_QUIET == FALSE)) {
+ /* Now check XML_RSC_ATTR_TARGET_ROLE and XML_RSC_ATTR_MANAGED */
+diff --git a/tools/crm_resource.h b/tools/crm_resource.h
+index 0b8dd2a..e28c9ef 100644
+--- a/tools/crm_resource.h
++++ b/tools/crm_resource.h
+@@ -76,6 +76,9 @@ int cli_resource_search(resource_t *rsc, const char *requested_name,
+ int cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
+ resource_t *rsc, const char *operation,
+ const char *interval, pe_working_set_t *data_set);
++int cli_resource_delete_failures(crm_ipc_t *crmd_channel, const char *host_uname,
++ resource_t *rsc, const char *operation,
++ const char *interval, pe_working_set_t *data_set);
+ int cli_resource_restart(resource_t * rsc, const char *host, int timeout_ms, cib_t * cib);
+ int cli_resource_move(resource_t *rsc, const char *rsc_id,
+ const char *host_name, cib_t *cib,
+diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
+index 5004935..9aa7b7e 100644
+--- a/tools/crm_resource_runtime.c
++++ b/tools/crm_resource_runtime.c
+@@ -681,6 +681,42 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
+ return rc;
+ }
+
++int
++cli_resource_delete_failures(crm_ipc_t *crmd_channel, const char *host_uname,
++ resource_t *rsc, const char *operation,
++ const char *interval, pe_working_set_t *data_set)
++{
++ int rc = pcmk_ok;
++
++ for (xmlNode *xml_op = __xml_first_child(data_set->failed); xml_op != NULL;
++ xml_op = __xml_next(xml_op)) {
++
++ const char *node = crm_element_value(xml_op, XML_ATTR_UNAME);
++ const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
++ const char *task_interval = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
++ const char *resource_name = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
++
++ if(resource_name == NULL) {
++ continue;
++ } else if(host_uname && safe_str_neq(host_uname, node)) {
++ continue;
++ } else if(rsc->id && safe_str_neq(rsc->id, resource_name)) {
++ continue;
++ } else if(operation && safe_str_neq(operation, task)) {
++ continue;
++ } else if(interval && safe_str_neq(interval, task_interval)) {
++ continue;
++ }
++
++ crm_debug("Erasing %s failure for %s (%s detected) on %s",
++ task, rsc->id, resource_name, node);
++ rc = cli_resource_delete(crmd_channel, node, rsc, task,
++ task_interval, data_set);
++ }
++
++ return rc;
++}
++
+ void
+ cli_resource_check(cib_t * cib_conn, resource_t *rsc)
+ {
+--
+1.8.3.1
+
+
+From 4ae40b495305b87f59e439de3298910c243c171d Mon Sep 17 00:00:00 2001
+From: "Gao,Yan" <ygao@suse.com>
+Date: Fri, 8 Dec 2017 16:22:54 +0100
+Subject: [PATCH 2/8] Fix: tools: crm_resource --cleanup for non-primitive
+ resources
+
+---
+ tools/crm_resource_runtime.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
+index 9aa7b7e..98cd27f 100644
+--- a/tools/crm_resource_runtime.c
++++ b/tools/crm_resource_runtime.c
+@@ -688,6 +688,24 @@ cli_resource_delete_failures(crm_ipc_t *crmd_channel, const char *host_uname,
+ {
+ int rc = pcmk_ok;
+
++ if (rsc == NULL) {
++ return -ENXIO;
++
++ } else if (rsc->children) {
++ GListPtr lpc = NULL;
++
++ for (lpc = rsc->children; lpc != NULL; lpc = lpc->next) {
++ resource_t *child = (resource_t *) lpc->data;
++
++ rc = cli_resource_delete_failures(crmd_channel, host_uname, child, operation,
++ interval, data_set);
++ if(rc != pcmk_ok) {
++ return rc;
++ }
++ }
++ return pcmk_ok;
++ }
++
+ for (xmlNode *xml_op = __xml_first_child(data_set->failed); xml_op != NULL;
+ xml_op = __xml_next(xml_op)) {
+
+--
+1.8.3.1
+
+
+From 6ce88cdbcbe15b7e81a4234eb92a93663243a7ff Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Mon, 11 Dec 2017 12:23:06 -0600
-Subject: [PATCH] Fix: tools: crm_resource --cleanup
+Subject: [PATCH 3/8] Fix: tools: crm_resource --cleanup
The new "failures only" mode of crm_resource --cleanup had multiple issues,
including not working without --resource specified, comparing a
@@ -15,10 +173,10 @@ but only when clearing LRM history entries.
3 files changed, 202 insertions(+), 100 deletions(-)
diff --git a/tools/crm_resource.c b/tools/crm_resource.c
-index 4ddcef4..5152004 100644
+index 331adf6..e3f8f86 100644
--- a/tools/crm_resource.c
+++ b/tools/crm_resource.c
-@@ -1092,14 +1092,20 @@ main(int argc, char **argv)
+@@ -1101,14 +1101,20 @@ main(int argc, char **argv)
rc = cli_resource_delete_attribute(rsc, rsc_id, prop_set, prop_id,
prop_name, cib_conn, &data_set);
@@ -44,7 +202,7 @@ index 4ddcef4..5152004 100644
cli_resource_check(cib_conn, rsc);
}
-@@ -1107,22 +1113,9 @@ main(int argc, char **argv)
+@@ -1116,22 +1122,9 @@ main(int argc, char **argv)
start_mainloop();
}
@@ -91,10 +249,10 @@ index e28c9ef..0ac51f2 100644
int cli_resource_move(resource_t *rsc, const char *rsc_id,
const char *host_name, cib_t *cib,
diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
-index 1048636..bdebb0b 100644
+index 98cd27f..2cc2bec 100644
--- a/tools/crm_resource_runtime.c
+++ b/tools/crm_resource_runtime.c
-@@ -532,15 +532,129 @@ rsc_fail_name(resource_t *rsc)
+@@ -558,15 +558,129 @@ rsc_fail_name(resource_t *rsc)
return is_set(rsc->flags, pe_rsc_unique)? strdup(name) : clone_strip(name);
}
@@ -227,7 +385,7 @@ index 1048636..bdebb0b 100644
if (rsc == NULL) {
return -ENXIO;
-@@ -552,8 +666,8 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
+@@ -578,8 +692,8 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
resource_t *child = (resource_t *) lpc->data;
rc = cli_resource_delete(crmd_channel, host_uname, child, operation,
@@ -238,7 +396,7 @@ index 1048636..bdebb0b 100644
return rc;
}
}
-@@ -585,8 +699,13 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
+@@ -611,8 +725,13 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
node = (node_t *) lpc->data;
if (node->details->online) {
@@ -254,7 +412,7 @@ index 1048636..bdebb0b 100644
}
}
-@@ -611,102 +730,91 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
+@@ -637,102 +756,91 @@ cli_resource_delete(crm_ipc_t *crmd_channel, const char *host_uname,
if (crmd_channel == NULL) {
printf("Dry run: skipping clean-up of %s on %s due to CIB_file\n",
rsc->id, host_uname);
@@ -417,3 +575,381 @@ index 1048636..bdebb0b 100644
--
1.8.3.1
+
+From 0b6c3b3064401c8f0ebb48ccfd11f43dc2dc2b1b Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Tue, 12 Dec 2017 10:02:22 -0600
+Subject: [PATCH 4/8] Fix: tools: crm_resource --cleanup with no resource
+ specified
+
+7a813755 failed to completely fix --cleanup without --resource
+---
+ tools/crm_resource_runtime.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
+index 2cc2bec..ce86a49 100644
+--- a/tools/crm_resource_runtime.c
++++ b/tools/crm_resource_runtime.c
+@@ -595,6 +595,7 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
+ {
+ int rc = pcmk_ok;
+ const char *failed_value = NULL;
++ const char *failed_id = NULL;
+ const char *interval_ms_str = NULL;
+ GHashTable *rscs = NULL;
+ GHashTableIter iter;
+@@ -613,11 +614,14 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
+ for (xmlNode *xml_op = __xml_first_child(data_set->failed); xml_op != NULL;
+ xml_op = __xml_next(xml_op)) {
+
++ failed_id = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
++ if (failed_id == NULL) {
++ // Malformed history entry, should never happen
++ continue;
++ }
++
+ // No resource specified means all resources match
+- failed_value = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
+- if (rsc_id == NULL) {
+- rsc_id = failed_value;
+- } else if (safe_str_neq(rsc_id, failed_value)) {
++ if (rsc_id && safe_str_neq(rsc_id, failed_id)) {
+ continue;
+ }
+
+@@ -641,13 +645,13 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
+ }
+ }
+
+- g_hash_table_add(rscs, (gpointer) rsc_id);
++ g_hash_table_add(rscs, (gpointer) failed_id);
+ }
+
+ g_hash_table_iter_init(&iter, rscs);
+- while (g_hash_table_iter_next(&iter, (gpointer *) &rsc_id, NULL)) {
+- crm_debug("Erasing failures of %s on %s", rsc_id, node_name);
+- rc = clear_rsc_history(crmd_channel, node_name, rsc_id, data_set);
++ while (g_hash_table_iter_next(&iter, (gpointer *) &failed_id, NULL)) {
++ crm_debug("Erasing failures of %s on %s", failed_id, node_name);
++ rc = clear_rsc_history(crmd_channel, node_name, failed_id, data_set);
+ if (rc != pcmk_ok) {
+ return rc;
+ }
+--
+1.8.3.1
+
+
+From 9d5a1dae23a44db190782560d8dbdf50343b3692 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Wed, 24 Jan 2018 10:51:34 -0600
+Subject: [PATCH 5/8] Low: tools: crm_resource --refresh should ignore
+ --operation and --interval
+
+It already did when a resource was not specified.
+Also update help text to clarify cleanup vs refresh.
+---
+ tools/crm_resource.c | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/tools/crm_resource.c b/tools/crm_resource.c
+index e3f8f86..d00c8f2 100644
+--- a/tools/crm_resource.c
++++ b/tools/crm_resource.c
+@@ -214,15 +214,17 @@ static struct crm_option long_options[] = {
+ "cleanup", no_argument, NULL, 'C',
+ #if 0
+ // new behavior disabled until 2.0.0
+- "\t\tDelete failed operations from a resource's history allowing its current state to be rechecked.\n"
++ "\t\tIf resource has any past failures, clear its history and fail count.\n"
+ "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
++ "\t\t\t\t--operation and --interval apply to fail counts, but entire history is always cleared,\n"
++ "\t\t\t\tto allow current state to be rechecked.\n"
+ },
+ {
+ "refresh", no_argument, NULL, 'R',
+ #endif
+ "\t\tDelete resource's history (including failures) so its current state is rechecked.\n"
+- "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
+- "\t\t\t\tUnless --force is specified, resource's group or clone (if any) will also be cleaned"
++ "\t\t\t\tOptionally filtered by --resource and --node (otherwise all).\n"
++ "\t\t\t\tUnless --force is specified, resource's group or clone (if any) will also be refreshed."
+ },
+ {
+ "set-parameter", required_argument, NULL, 'p',
+@@ -442,7 +444,6 @@ main(int argc, char **argv)
+ bool require_resource = TRUE; /* whether command requires that resource be specified */
+ bool require_dataset = TRUE; /* whether command requires populated dataset instance */
+ bool require_crmd = FALSE; /* whether command requires connection to CRMd */
+- bool just_errors = TRUE; /* whether cleanup command deletes all history or just errors */
+
+ int rc = pcmk_ok;
+ int is_ocf_rc = 0;
+@@ -634,8 +635,7 @@ main(int argc, char **argv)
+ if (cib_file == NULL) {
+ require_crmd = TRUE;
+ }
+- just_errors = FALSE;
+- rsc_cmd = 'C';
++ rsc_cmd = 'R';
+ find_flags = pe_find_renamed|pe_find_anon;
+ break;
+
+@@ -645,7 +645,6 @@ main(int argc, char **argv)
+ if (cib_file == NULL) {
+ require_crmd = TRUE;
+ }
+- just_errors = FALSE; // disable until 2.0.0
+ rsc_cmd = 'C';
+ find_flags = pe_find_renamed|pe_find_anon;
+ break;
+@@ -1101,7 +1100,7 @@ main(int argc, char **argv)
+ rc = cli_resource_delete_attribute(rsc, rsc_id, prop_set, prop_id,
+ prop_name, cib_conn, &data_set);
+
+- } else if ((rsc_cmd == 'C') && rsc) {
++ } else if ((rsc_cmd == 'R') && rsc) {
+ if (do_force == FALSE) {
+ rsc = uber_parent(rsc);
+ }
+@@ -1110,8 +1109,8 @@ main(int argc, char **argv)
+ crm_debug("%s of %s (%s requested) on %s",
+ (just_errors? "Clearing failures" : "Re-checking the state"),
+ rsc->id, rsc_id, (host_uname? host_uname : "all hosts"));
+- rc = cli_resource_delete(crmd_channel, host_uname, rsc, operation,
+- interval, just_errors, &data_set);
++ rc = cli_resource_delete(crmd_channel, host_uname, rsc, NULL, 0,
++ &data_set);
+
+ if ((rc == pcmk_ok) && !BE_QUIET) {
+ // Show any reasons why resource might stay stopped
+@@ -1122,14 +1121,14 @@ main(int argc, char **argv)
+ start_mainloop();
+ }
+
+- } else if (rsc_cmd == 'C' && just_errors) {
++ } else if (rsc_cmd == 'C') {
+ rc = cli_cleanup_all(crmd_channel, host_uname, operation, interval,
+ &data_set);
+ if (rc == pcmk_ok) {
+ start_mainloop();
+ }
+
+- } else if (rsc_cmd == 'C') {
++ } else if (rsc_cmd == 'R') {
+ #if HAVE_ATOMIC_ATTRD
+ const char *router_node = host_uname;
+ xmlNode *msg_data = NULL;
+--
+1.8.3.1
+
+
+From 035bebd78c1936b0749ae64fe949deb5d77effe9 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Tue, 13 Feb 2018 12:43:48 -0600
+Subject: [PATCH 6/8] Fix: tools: auto-merge was insufficient
+
+The master and 2.0 branches had taken different approaches to crm_resource
+clean-up refactoring in response to different issues. It was necessary to
+combine the code more carefully.
+---
+ tools/crm_resource.c | 13 ++-----------
+ tools/crm_resource_runtime.c | 16 +++++++++++-----
+ 2 files changed, 13 insertions(+), 16 deletions(-)
+
+diff --git a/tools/crm_resource.c b/tools/crm_resource.c
+index d00c8f2..fc46cc0 100644
+--- a/tools/crm_resource.c
++++ b/tools/crm_resource.c
+@@ -628,6 +628,7 @@ main(int argc, char **argv)
+ timeout_ms = crm_get_msec(optarg);
+ break;
+
++ case 'C':
+ case 'R':
+ case 'P':
+ crm_log_args(argc, argv);
+@@ -635,17 +636,7 @@ main(int argc, char **argv)
+ if (cib_file == NULL) {
+ require_crmd = TRUE;
+ }
+- rsc_cmd = 'R';
+- find_flags = pe_find_renamed|pe_find_anon;
+- break;
+-
+- case 'C':
+- crm_log_args(argc, argv);
+- require_resource = FALSE;
+- if (cib_file == NULL) {
+- require_crmd = TRUE;
+- }
+- rsc_cmd = 'C';
++ rsc_cmd = 'R'; // disable new behavior until 2.0
+ find_flags = pe_find_renamed|pe_find_anon;
+ break;
+
+diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
+index ce86a49..e02cc44 100644
+--- a/tools/crm_resource_runtime.c
++++ b/tools/crm_resource_runtime.c
+@@ -621,8 +621,14 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
+ }
+
+ // No resource specified means all resources match
+- if (rsc_id && safe_str_neq(rsc_id, failed_id)) {
+- continue;
++ if (rsc_id) {
++ resource_t *fail_rsc = pe_find_resource_with_flags(data_set->resources,
++ failed_id,
++ pe_find_renamed|pe_find_anon);
++
++ if (!fail_rsc || safe_str_neq(rsc_id, fail_rsc->id)) {
++ continue;
++ }
+ }
+
+ // Host name should always have been provided by this point
+@@ -790,8 +796,8 @@ cli_cleanup_all(crm_ipc_t *crmd_channel, const char *node_name,
+ const char *operation, const char *interval,
+ pe_working_set_t *data_set)
+ {
+- int attr_options = attrd_opt_none;
+ int rc = pcmk_ok;
++ int attr_options = attrd_opt_none;
+ const char *display_name = node_name? node_name : "all nodes";
+
+ if (crmd_channel == NULL) {
+@@ -836,8 +842,8 @@ cli_cleanup_all(crm_ipc_t *crmd_channel, const char *node_name,
+ rc = clear_rsc_failures(crmd_channel, node->details->uname, NULL,
+ operation, interval, data_set);
+ if (rc != pcmk_ok) {
+- printf("Cleaned all resource failures on all nodes, but unable to clean history on %s: %s\n",
+- node->details->uname, pcmk_strerror(rc));
++ printf("Cleaned all resource failures on all nodes, but unable to clean history: %s\n",
++ pcmk_strerror(rc));
+ return rc;
+ }
+ }
+--
+1.8.3.1
+
+
+From 5fa351ec714de6b67c456fb1a85a8ebdb658f604 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Tue, 7 Aug 2018 10:42:59 -0500
+Subject: [PATCH 7/8] Low: tools: update crm_resource for 1.1 vs 2.0
+ differences
+
+---
+ tools/crm_resource.c | 37 +++++++++++++++++++++++++++----------
+ 1 file changed, 27 insertions(+), 10 deletions(-)
+
+diff --git a/tools/crm_resource.c b/tools/crm_resource.c
+index fc46cc0..128d075 100644
+--- a/tools/crm_resource.c
++++ b/tools/crm_resource.c
+@@ -352,11 +352,13 @@ static struct crm_option long_options[] = {
+ },
+ {
+ "operation", required_argument, NULL, 'n',
+- "\tOperation to clear instead of all (with -C -r)"
++ "\tOperation to clear instead of all (with -C -r)",
++ pcmk_option_hidden // only used with 2.0 -C behavior
+ },
+ {
+ "interval", required_argument, NULL, 'I',
+- "\tInterval of operation to clear (default 0) (with -C -r -n)"
++ "\tInterval of operation to clear (default 0) (with -C -r -n)",
++ pcmk_option_hidden // only used with 2.0 -C behavior
+ },
+ {
+ "set-name", required_argument, NULL, 's',
+@@ -1091,17 +1093,16 @@ main(int argc, char **argv)
+ rc = cli_resource_delete_attribute(rsc, rsc_id, prop_set, prop_id,
+ prop_name, cib_conn, &data_set);
+
+- } else if ((rsc_cmd == 'R') && rsc) {
++ } else if ((rsc_cmd == 'C') && rsc) {
+ if (do_force == FALSE) {
+ rsc = uber_parent(rsc);
+ }
+ crmd_replies_needed = 0;
+
+- crm_debug("%s of %s (%s requested) on %s",
+- (just_errors? "Clearing failures" : "Re-checking the state"),
+- rsc->id, rsc_id, (host_uname? host_uname : "all hosts"));
+- rc = cli_resource_delete(crmd_channel, host_uname, rsc, NULL, 0,
+- &data_set);
++ crm_debug("Erasing failures of %s (%s requested) on %s",
++ rsc->id, rsc_id, (host_uname? host_uname: "all nodes"));
++ rc = cli_resource_delete(crmd_channel, host_uname, rsc,
++ operation, interval, TRUE, &data_set);
+
+ if ((rc == pcmk_ok) && !BE_QUIET) {
+ // Show any reasons why resource might stay stopped
+@@ -1119,6 +1120,22 @@ main(int argc, char **argv)
+ start_mainloop();
+ }
+
++ } else if ((rsc_cmd == 'R') && rsc) {
++ if (do_force == FALSE) {
++ rsc = uber_parent(rsc);
++ }
++ crmd_replies_needed = 0;
++
++ crm_debug("Re-checking the state of %s (%s requested) on %s",
++ rsc->id, rsc_id, (host_uname? host_uname: "all nodes"));
++ rc = cli_resource_delete(crmd_channel, host_uname, rsc,
++ NULL, 0, FALSE, &data_set);
++
++ if ((rc == pcmk_ok) && !BE_QUIET) {
++ // Show any reasons why resource might stay stopped
++ cli_resource_check(cib_conn, rsc);
++ }
++
+ } else if (rsc_cmd == 'R') {
+ #if HAVE_ATOMIC_ATTRD
+ const char *router_node = host_uname;
+@@ -1174,8 +1191,8 @@ main(int argc, char **argv)
+ crmd_replies_needed = 0;
+ for (rIter = data_set.resources; rIter; rIter = rIter->next) {
+ rsc = rIter->data;
+- cli_resource_delete(crmd_channel, host_uname, rsc, NULL, NULL,
+- &data_set);
++ cli_resource_delete(crmd_channel, host_uname, rsc, NULL, 0,
++ FALSE, &data_set);
+ }
+
+ start_mainloop();
+--
+1.8.3.1
+
+
+From 555bdce4ceaf9a406059150c9dee047151fb3d94 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Tue, 7 Aug 2018 14:11:50 -0500
+Subject: [PATCH 8/8] Low: tools: avoid function not available until glib
+ 2.32.0
+
+---
+ tools/crm_resource_runtime.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
+index e02cc44..41cc742 100644
+--- a/tools/crm_resource_runtime.c
++++ b/tools/crm_resource_runtime.c
+@@ -651,7 +651,10 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
+ }
+ }
+
++ /* not available until glib 2.32
+ g_hash_table_add(rscs, (gpointer) failed_id);
++ */
++ g_hash_table_insert(rscs, (gpointer) failed_id, (gpointer) failed_id);
+ }
+
+ g_hash_table_iter_init(&iter, rscs);
+--
+1.8.3.1
+
diff --git a/SOURCES/005-cleanup.patch b/SOURCES/005-cleanup.patch
deleted file mode 100644
index 8e568b1..0000000
--- a/SOURCES/005-cleanup.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a2305469012b5fe3713427412c12459085ed61a1 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Tue, 12 Dec 2017 10:02:22 -0600
-Subject: [PATCH] Fix: tools: crm_resource --cleanup with no resource specified
-
-7a813755 failed to completely fix --cleanup without --resource
----
- tools/crm_resource_runtime.c | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
-index bdebb0b..79f8b98 100644
---- a/tools/crm_resource_runtime.c
-+++ b/tools/crm_resource_runtime.c
-@@ -569,6 +569,7 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
- {
- int rc = pcmk_ok;
- const char *failed_value = NULL;
-+ const char *failed_id = NULL;
- const char *interval_ms_str = NULL;
- GHashTable *rscs = NULL;
- GHashTableIter iter;
-@@ -587,11 +588,14 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
- for (xmlNode *xml_op = __xml_first_child(data_set->failed); xml_op != NULL;
- xml_op = __xml_next(xml_op)) {
-
-+ failed_id = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
-+ if (failed_id == NULL) {
-+ // Malformed history entry, should never happen
-+ continue;
-+ }
-+
- // No resource specified means all resources match
-- failed_value = crm_element_value(xml_op, XML_LRM_ATTR_RSCID);
-- if (rsc_id == NULL) {
-- rsc_id = failed_value;
-- } else if (safe_str_neq(rsc_id, failed_value)) {
-+ if (rsc_id && safe_str_neq(rsc_id, failed_id)) {
- continue;
- }
-
-@@ -615,13 +619,13 @@ clear_rsc_failures(crm_ipc_t *crmd_channel, const char *node_name,
- }
- }
-
-- g_hash_table_add(rscs, (gpointer) rsc_id);
-+ g_hash_table_add(rscs, (gpointer) failed_id);
- }
-
- g_hash_table_iter_init(&iter, rscs);
-- while (g_hash_table_iter_next(&iter, (gpointer *) &rsc_id, NULL)) {
-- crm_debug("Erasing failures of %s on %s", rsc_id, node_name);
-- rc = clear_rsc_history(crmd_channel, node_name, rsc_id, data_set);
-+ while (g_hash_table_iter_next(&iter, (gpointer *) &failed_id, NULL)) {
-+ crm_debug("Erasing failures of %s on %s", failed_id, node_name);
-+ rc = clear_rsc_history(crmd_channel, node_name, failed_id, data_set);
- if (rc != pcmk_ok) {
- return rc;
- }
---
-1.8.3.1
-
diff --git a/SOURCES/005-corosync.patch b/SOURCES/005-corosync.patch
new file mode 100644
index 0000000..19ca4e3
--- /dev/null
+++ b/SOURCES/005-corosync.patch
@@ -0,0 +1,71 @@
+From 041026835bce4d4ae2390daccade0e74c4fa3c1c Mon Sep 17 00:00:00 2001
+From: Christine Caulfield <ccaulfie@redhat.com>
+Date: Thu, 26 Jul 2018 08:06:45 +0100
+Subject: [PATCH] Shutdown corosync after a fatal error
+
+If pacemaker shuts down due to being fenced by a non-power (eg fabric)
+fence agent then it should also take down corosync so that full cluster
+service on that node is lost, rather than just resource management.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1448221
+
+Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
+---
+ mcp/pacemaker.c | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
+index f57fc25..40a2de2 100644
+--- a/mcp/pacemaker.c
++++ b/mcp/pacemaker.c
+@@ -21,6 +21,9 @@
+ #include <crm/common/mainloop.h>
+ #include <crm/cluster/internal.h>
+ #include <crm/cluster.h>
++#ifdef SUPPORT_COROSYNC
++#include <corosync/cfg.h>
++#endif
+
+ #include <dirent.h>
+ #include <ctype.h>
+@@ -142,6 +145,28 @@ pcmk_process_exit(pcmk_child_t * child)
+ }
+ }
+
++static void pcmk_exit_with_cluster(int exitcode)
++{
++#ifdef SUPPORT_COROSYNC
++ corosync_cfg_handle_t cfg_handle;
++ cs_error_t err;
++
++ if (exitcode == DAEMON_RESPAWN_STOP) {
++ crm_info("Asking Corosync to shut down");
++ err = corosync_cfg_initialize(&cfg_handle, NULL);
++ if (err != CS_OK) {
++ crm_warn("Unable to open handle to corosync to close it down. err=%d", err);
++ }
++ err = corosync_cfg_try_shutdown(cfg_handle, COROSYNC_CFG_SHUTDOWN_FLAG_IMMEDIATE);
++ if (err != CS_OK) {
++ crm_warn("Corosync shutdown failed. err=%d", err);
++ }
++ corosync_cfg_finalize(cfg_handle);
++ }
++#endif
++ crm_exit(exitcode);
++}
++
+ static void
+ pcmk_child_exit(mainloop_child_t * p, pid_t pid, int core, int signo, int exitcode)
+ {
+@@ -423,7 +448,7 @@ pcmk_shutdown_worker(gpointer user_data)
+
+ if (fatal_error) {
+ crm_notice("Attempting to inhibit respawning after fatal error");
+- crm_exit(DAEMON_RESPAWN_STOP);
++ pcmk_exit_with_cluster(DAEMON_RESPAWN_STOP);
+ }
+
+ return TRUE;
+--
+1.8.3.1
+
diff --git a/SOURCES/006-fail-count.patch b/SOURCES/006-fail-count.patch
new file mode 100644
index 0000000..d902549
--- /dev/null
+++ b/SOURCES/006-fail-count.patch
@@ -0,0 +1,31 @@
+From cdbc6bfc8995ecc86da3fe81a463d8fc4ce1f8fd Mon Sep 17 00:00:00 2001
+From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
+Date: Mon, 30 Jul 2018 07:33:09 +0900
+Subject: [PATCH] Mid: controld: No update by already confirmed events.
+
+---
+ crmd/te_events.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/crmd/te_events.c b/crmd/te_events.c
+index 7b5ca2a..1f7a34c 100644
+--- a/crmd/te_events.c
++++ b/crmd/te_events.c
+@@ -510,6 +510,14 @@ process_graph_event(xmlNode *event, const char *event_node)
+ abort_transition(INFINITY, tg_restart, "Unknown event", event);
+
+ } else {
++
++ /* Actions already confirmed skip matching. */
++ /* ex. Ignoring xxx_last_0 or xxx_last_failure_0 generated by create_operation_update() in order to prevent duplicate fail-count from increasing. */
++ if (action->confirmed == TRUE) {
++ crm_log_xml_debug(event, "No update by already confirmed events :");
++ goto bail;
++ }
++
+ ignore_failures = safe_str_eq(
+ crm_meta_value(action->params, XML_OP_ATTR_ON_FAIL), "ignore");
+ match_graph_event(action, event, status, rc, target_rc, ignore_failures);
+--
+1.8.3.1
+
diff --git a/SOURCES/006-leaks.patch b/SOURCES/006-leaks.patch
deleted file mode 100644
index ab9fb37..0000000
--- a/SOURCES/006-leaks.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 5042a3b19a2f2bfa3d09b4d1029f53e6b674918b Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 14 Dec 2017 09:16:47 -0600
-Subject: [PATCH 1/5] Test: CTS: remove dead code
-
-makes static analysis happy
----
- cts/CTSaudits.py | 1 -
- cts/environment.py | 1 -
- cts/remote.py | 5 +----
- cts/watcher.py | 6 +++---
- 4 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/cts/CTSaudits.py b/cts/CTSaudits.py
-index aff897f..d9fbeb9 100755
---- a/cts/CTSaudits.py
-+++ b/cts/CTSaudits.py
-@@ -190,7 +190,6 @@ class DiskAudit(ClusterAudit):
-
- if answer and answer == "n":
- raise ValueError("Disk full on %s" % (node))
-- ret = 0
-
- elif remaining_mb < 100 or used_percent > 90:
- self.CM.log("WARN: Low on log disk space (%dMB) on %s" % (remaining_mb, node))
-diff --git a/cts/environment.py b/cts/environment.py
-index 75a18c8..6c4831c 100644
---- a/cts/environment.py
-+++ b/cts/environment.py
-@@ -182,7 +182,6 @@ class Environment:
-
- else:
- raise ValueError("Unknown stack: "+name)
-- sys.exit(1)
-
- def get_stack_short(self):
- # Create the Cluster Manager object
-diff --git a/cts/remote.py b/cts/remote.py
-index 8c36918..7cef40e 100644
---- a/cts/remote.py
-+++ b/cts/remote.py
-@@ -220,10 +220,7 @@ class RemoteExec:
-
- if not silent:
- for err in errors:
-- if stdout == 3:
-- result.append("error: "+err)
-- else:
-- self.debug("cmd: stderr: %s" % err)
-+ self.debug("cmd: stderr: %s" % err)
-
- if stdout == 0:
- if not silent and result:
-diff --git a/cts/watcher.py b/cts/watcher.py
-index de032f7..42685ad 100644
---- a/cts/watcher.py
-+++ b/cts/watcher.py
-@@ -337,19 +337,19 @@ class LogWatcher(RemoteExec):
- self.kind = kind
- else:
- raise
-- self.kind = self.Env["LogWatcher"]
-+ #self.kind = self.Env["LogWatcher"]
-
- if log:
- self.filename = log
- else:
- raise
-- self.filename = self.Env["LogFileName"]
-+ #self.filename = self.Env["LogFileName"]
-
- if hosts:
- self.hosts = hosts
- else:
- raise
-- self.hosts = self.Env["nodes"]
-+ #self.hosts = self.Env["nodes"]
-
- if trace_lw:
- self.debug_level = 3
---
-1.8.3.1
-
-
-From 570929eba229558b1a6900ffc54e4d5ee4150f74 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 14 Dec 2017 09:23:03 -0600
-Subject: [PATCH 2/5] Refactor: pengine: validate more function arguments
-
-not an issue with current code, but makes static analysis happy
----
- pengine/clone.c | 3 ++-
- pengine/utilization.c | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/pengine/clone.c b/pengine/clone.c
-index 99bac7e..e81dbc8 100644
---- a/pengine/clone.c
-+++ b/pengine/clone.c
-@@ -955,6 +955,7 @@ is_child_compatible(resource_t *child_rsc, node_t * local_node, enum rsc_role_e
- node_t *node = NULL;
- enum rsc_role_e next_role = child_rsc->fns->state(child_rsc, current);
-
-+ CRM_CHECK(child_rsc && local_node, return FALSE);
- if (is_set_recursive(child_rsc, pe_rsc_block, TRUE) == FALSE) {
- /* We only want instances that haven't failed */
- node = child_rsc->fns->location(child_rsc, NULL, current);
-@@ -965,7 +966,7 @@ is_child_compatible(resource_t *child_rsc, node_t * local_node, enum rsc_role_e
- return FALSE;
- }
-
-- if (node && local_node && node->details == local_node->details) {
-+ if (node && (node->details == local_node->details)) {
- return TRUE;
-
- } else if (node) {
-diff --git a/pengine/utilization.c b/pengine/utilization.c
-index f42c85d..05f8d78 100644
---- a/pengine/utilization.c
-+++ b/pengine/utilization.c
-@@ -341,6 +341,7 @@ process_utilization(resource_t * rsc, node_t ** prefer, pe_working_set_t * data_
- {
- int alloc_details = scores_log_level + 1;
-
-+ CRM_CHECK(rsc && prefer && data_set, return);
- if (safe_str_neq(data_set->placement_strategy, "default")) {
- GHashTableIter iter;
- GListPtr colocated_rscs = NULL;
---
-1.8.3.1
-
-
-From db2fdc9a452fef11d397e25202fde8ba1bad4cd3 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 14 Dec 2017 10:36:20 -0600
-Subject: [PATCH 3/5] Low: libcrmservice: avoid memory leak on DBus error
-
----
- lib/services/dbus.c | 47 +++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 37 insertions(+), 10 deletions(-)
-
-diff --git a/lib/services/dbus.c b/lib/services/dbus.c
-index fb3e867..58df927 100644
---- a/lib/services/dbus.c
-+++ b/lib/services/dbus.c
-@@ -23,6 +23,15 @@ struct db_getall_data {
- void (*callback)(const char *name, const char *value, void *userdata);
- };
-
-+static void
-+free_db_getall_data(struct db_getall_data *data)
-+{
-+ free(data->target);
-+ free(data->object);
-+ free(data->name);
-+ free(data);
-+}
-+
- DBusConnection *
- pcmk_dbus_connect(void)
- {
-@@ -196,6 +205,20 @@ pcmk_dbus_send_recv(DBusMessage *msg, DBusConnection *connection,
- return reply;
- }
-
-+/*!
-+ * \internal
-+ * \brief Send a DBus message with a callback for the reply
-+ *
-+ * \param[in] msg DBus message to send
-+ * \param[in,out] connection DBus connection to send on
-+ * \param[in] done Function to call when pending call completes
-+ * \param[in] user_data Data to pass to done callback
-+ *
-+ * \return Handle for reply on success, NULL on error
-+ * \note The caller can assume that the done callback is called always and
-+ * only when the return value is non-NULL. (This allows the caller to
-+ * know where it should free dynamically allocated user_data.)
-+ */
- DBusPendingCall *
- pcmk_dbus_send(DBusMessage *msg, DBusConnection *connection,
- void(*done)(DBusPendingCall *pending, void *user_data),
-@@ -359,11 +382,7 @@ pcmk_dbus_lookup_result(DBusMessage *reply, struct db_getall_data *data)
- }
-
- cleanup:
-- free(data->target);
-- free(data->object);
-- free(data->name);
-- free(data);
--
-+ free_db_getall_data(data);
- return output;
- }
-
-@@ -424,11 +443,19 @@ pcmk_dbus_get_property(DBusConnection *connection, const char *target,
- query_data->name = strdup(name);
- }
-
-- if(query_data->callback) {
-- DBusPendingCall* _pending;
-- _pending = pcmk_dbus_send(msg, connection, pcmk_dbus_lookup_cb, query_data, timeout);
-- if (pending != NULL) {
-- *pending = _pending;
-+ if (query_data->callback) {
-+ DBusPendingCall *local_pending;
-+
-+ local_pending = pcmk_dbus_send(msg, connection, pcmk_dbus_lookup_cb,
-+ query_data, timeout);
-+ if (local_pending == NULL) {
-+ // pcmk_dbus_lookup_cb() was not called in this case
-+ free_db_getall_data(query_data);
-+ query_data = NULL;
-+ }
-+
-+ if (pending) {
-+ *pending = local_pending;
- }
-
- } else {
---
-1.8.3.1
-
-
-From 4a774710ec7269ec3a1427ae09fc6ca435c66e92 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 14 Dec 2017 12:44:04 -0600
-Subject: [PATCH 4/5] Build: systemd unit files: restore DBus dependency
-
-06e2e26 removed the unit files' DBus dependency on the advice of a
-systemd developer, but it is necessary
----
- lrmd/pacemaker_remote.service.in | 3 +++
- mcp/pacemaker.service.in | 4 ++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/lrmd/pacemaker_remote.service.in b/lrmd/pacemaker_remote.service.in
-index d5717f6..1c596e1 100644
---- a/lrmd/pacemaker_remote.service.in
-+++ b/lrmd/pacemaker_remote.service.in
-@@ -2,8 +2,11 @@
- Description=Pacemaker Remote Service
- Documentation=man:pacemaker_remoted http://clusterlabs.org/doc/en-US/Pacemaker/1.1-pcs/html/Pacemaker_Remote/index.html
-
-+# See main pacemaker unit file for descriptions of why these are needed
- After=network.target
- After=time-sync.target
-+After=dbus.service
-+Wants=dbus.service
- After=resource-agents-deps.target
- Wants=resource-agents-deps.target
- After=syslog.service
-diff --git a/mcp/pacemaker.service.in b/mcp/pacemaker.service.in
-index 516de0f..e532ea2 100644
---- a/mcp/pacemaker.service.in
-+++ b/mcp/pacemaker.service.in
-@@ -14,6 +14,10 @@ After=network.target
- # and failure timestamps, so wait until it's done.
- After=time-sync.target
-
-+# Managing systemd resources requires DBus.
-+After=dbus.service
-+Wants=dbus.service
-+
- # Some OCF resources may have dependencies that aren't managed by the cluster;
- # these must be started before Pacemaker and stopped after it. The
- # resource-agents package provides this target, which lets system adminstrators
---
-1.8.3.1
-
-
-From 69de188a7263ba66afa0e8a3a46a64f07a7facca Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 14 Dec 2017 16:05:12 -0600
-Subject: [PATCH 5/5] Low: attrd: avoid small memory leak at start-up
-
-introduced by 3518544
----
- attrd/commands.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/attrd/commands.c b/attrd/commands.c
-index 0a20b26..20bd82f 100644
---- a/attrd/commands.c
-+++ b/attrd/commands.c
-@@ -539,6 +539,7 @@ attrd_broadcast_protocol()
- crm_xml_add(attrd_op, F_ATTRD_VALUE, ATTRD_PROTOCOL_VERSION);
- crm_xml_add_int(attrd_op, F_ATTRD_IS_PRIVATE, 1);
- attrd_client_update(attrd_op);
-+ free_xml(attrd_op);
- }
-
- void
---
-1.8.3.1
-
diff --git a/SOURCES/007-bundles.patch b/SOURCES/007-bundles.patch
deleted file mode 100644
index 28ea0ef..0000000
--- a/SOURCES/007-bundles.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 2ce5fc46463ff7b9a5a2c68602d8c5b35a7c37d7 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Tue, 16 Jan 2018 19:05:31 +1100
-Subject: [PATCH 1/2] Bug rhbz#1519812 - Prevent notify actions from causing
- --wait to hang
-
----
- tools/crm_resource_runtime.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
-index 22bdebf..189d1b3 100644
---- a/tools/crm_resource_runtime.c
-+++ b/tools/crm_resource_runtime.c
-@@ -1343,10 +1343,19 @@ done:
- return rc;
- }
-
--#define action_is_pending(action) \
-- ((is_set((action)->flags, pe_action_optional) == FALSE) \
-- && (is_set((action)->flags, pe_action_runnable) == TRUE) \
-- && (is_set((action)->flags, pe_action_pseudo) == FALSE))
-+static inline int action_is_pending(action_t *action)
-+{
-+ if(is_set(action->flags, pe_action_optional)) {
-+ return FALSE;
-+ } else if(is_set(action->flags, pe_action_runnable) == FALSE) {
-+ return FALSE;
-+ } else if(is_set(action->flags, pe_action_pseudo)) {
-+ return FALSE;
-+ } else if(safe_str_eq("notify", action->task)) {
-+ return FALSE;
-+ }
-+ return TRUE;
-+}
-
- /*!
- * \internal
-@@ -1362,7 +1371,9 @@ actions_are_pending(GListPtr actions)
- GListPtr action;
-
- for (action = actions; action != NULL; action = action->next) {
-- if (action_is_pending((action_t *) action->data)) {
-+ action_t *a = (action_t *)action->data;
-+ if (action_is_pending(a)) {
-+ crm_notice("Waiting for %s (flags=0x%.8x)", a->uuid, a->flags);
- return TRUE;
- }
- }
---
-1.8.3.1
-
-
-From ef15ea4f687e7f9ba1f8a99548ee1e0bf9d4b50a Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Mon, 22 Jan 2018 21:18:46 +1100
-Subject: [PATCH 2/2] Fix: rhbz#1527072 - Correctly observe colocation
- constraints with bundles in the Master role
-
----
- pengine/container.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/pengine/container.c b/pengine/container.c
-index f5d916c..15d094d 100644
---- a/pengine/container.c
-+++ b/pengine/container.c
-@@ -486,10 +486,18 @@ container_rsc_colocation_rh(resource_t * rsc_lh, resource_t * rsc, rsc_colocatio
- } else {
- node_t *chosen = tuple->docker->fns->location(tuple->docker, NULL, FALSE);
-
-- if (chosen != NULL && is_set_recursive(tuple->docker, pe_rsc_block, TRUE) == FALSE) {
-- pe_rsc_trace(rsc, "Allowing %s: %s %d", constraint->id, chosen->details->uname, chosen->weight);
-- allocated_rhs = g_list_prepend(allocated_rhs, chosen);
-+ if (chosen == NULL || is_set_recursive(tuple->docker, pe_rsc_block, TRUE)) {
-+ continue;
-+ }
-+ if(constraint->role_rh >= RSC_ROLE_MASTER && tuple->child == NULL) {
-+ continue;
- }
-+ if(constraint->role_rh >= RSC_ROLE_MASTER && tuple->child->next_role < RSC_ROLE_MASTER) {
-+ continue;
-+ }
-+
-+ pe_rsc_trace(rsc, "Allowing %s: %s %d", constraint->id, chosen->details->uname, chosen->weight);
-+ allocated_rhs = g_list_prepend(allocated_rhs, chosen);
- }
- }
-
---
-1.8.3.1
-
diff --git a/SOURCES/007-stderr.patch b/SOURCES/007-stderr.patch
new file mode 100644
index 0000000..e71570a
--- /dev/null
+++ b/SOURCES/007-stderr.patch
@@ -0,0 +1,30 @@
+From d351a328ec7d785b1ab3a39c34cb29f870164733 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Fri, 21 Sep 2018 16:07:37 -0500
+Subject: [PATCH] Low: tools: ensure crm_resource --force-* commands get stderr
+ messages
+
+---
+ tools/crm_resource_runtime.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
+index 1b6a3f3..1a360a0 100644
+--- a/tools/crm_resource_runtime.c
++++ b/tools/crm_resource_runtime.c
+@@ -1757,6 +1757,12 @@ cli_resource_execute(resource_t *rsc, const char *requested_name,
+ setenv("OCF_TRACE_RA", "1", 1);
+ }
+
++ /* A resource agent using the standard ocf-shellfuncs library will not print
++ * messages to stderr if it doesn't have a controlling terminal (e.g. if
++ * crm_resource is called via script or ssh). This forces it to do so.
++ */
++ setenv("OCF_TRACE_FILE", "/dev/stderr", 0);
++
+ if (override_hash) {
+ GHashTableIter iter;
+ char *name = NULL;
+--
+1.8.3.1
+
diff --git a/SOURCES/008-quorum.patch b/SOURCES/008-quorum.patch
deleted file mode 100644
index 0d2dece..0000000
--- a/SOURCES/008-quorum.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 7c322f4b9a7f36eba1d3ca74d7dd8fe1093ca7bd Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Mon, 22 Jan 2018 11:38:22 -0600
-Subject: [PATCH] Low: crmd: quorum gain should always cause new transition
-
-0b689055 aborted the transition on quorum loss, but quorum can also be acquired
-without triggering a new transition, if corosync gives quorum without a node
-joining (e.g. forced via corosync-cmapctl, or perhaps via heuristics).
-
-This aborts the transition when quorum is gained, but only after a 5-second
-delay, if the transition has not been aborted in that time. This avoids an
-unnecessary abort in the vast majority of cases where an abort is already done,
-and it allows some time for all nodes to connect when quorum is gained, rather
-than immediately fencing remaining unseen nodes.
----
- crmd/membership.c | 22 +++++++++++++++++-----
- crmd/te_utils.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
- crmd/tengine.h | 2 ++
- 3 files changed, 65 insertions(+), 7 deletions(-)
-
-diff --git a/crmd/membership.c b/crmd/membership.c
-index c36dbed..4f2fa8a 100644
---- a/crmd/membership.c
-+++ b/crmd/membership.c
-@@ -438,12 +438,24 @@ crm_update_quorum(gboolean quorum, gboolean force_update)
- fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete);
- free_xml(update);
-
-- /* If a node not running any resources is cleanly shut down and drops us
-- * below quorum, we won't necessarily abort the transition, so abort it
-- * here to be safe.
-+ /* Quorum changes usually cause a new transition via other activity:
-+ * quorum gained via a node joining will abort via the node join,
-+ * and quorum lost via a node leaving will usually abort via resource
-+ * activity and/or fencing.
-+ *
-+ * However, it is possible that nothing else causes a transition (e.g.
-+ * someone forces quorum via corosync-cmaptcl, or quorum is lost due to
-+ * a node in standby shutting down cleanly), so here ensure a new
-+ * transition is triggered.
- */
-- if (quorum == FALSE) {
-- abort_transition(INFINITY, tg_restart, "Quorum loss", NULL);
-+ if (quorum) {
-+ /* If quorum was gained, abort after a short delay, in case multiple
-+ * nodes are joining around the same time, so the one that brings us
-+ * to quorum doesn't cause all the remaining ones to be fenced.
-+ */
-+ abort_after_delay(INFINITY, tg_restart, "Quorum gained", 5000);
-+ } else {
-+ abort_transition(INFINITY, tg_restart, "Quorum lost", NULL);
- }
- }
- fsa_has_quorum = quorum;
-diff --git a/crmd/te_utils.c b/crmd/te_utils.c
-index dab02d3..8d105dc 100644
---- a/crmd/te_utils.c
-+++ b/crmd/te_utils.c
-@@ -530,6 +530,46 @@ trigger_graph_processing(const char *fn, int line)
- mainloop_set_trigger(transition_trigger);
- }
-
-+static struct abort_timer_s {
-+ bool aborted;
-+ guint id;
-+ int priority;
-+ enum transition_action action;
-+ const char *text;
-+} abort_timer = { 0, };
-+
-+static gboolean
-+abort_timer_popped(gpointer data)
-+{
-+ if (abort_timer.aborted == FALSE) {
-+ abort_transition(abort_timer.priority, abort_timer.action,
-+ abort_timer.text, NULL);
-+ }
-+ abort_timer.id = 0;
-+ return FALSE; // do not immediately reschedule timer
-+}
-+
-+/*!
-+ * \internal
-+ * \brief Abort transition after delay, if not already aborted in that time
-+ *
-+ * \param[in] abort_text Must be literal string
-+ */
-+void
-+abort_after_delay(int abort_priority, enum transition_action abort_action,
-+ const char *abort_text, guint delay_ms)
-+{
-+ if (abort_timer.id) {
-+ // Timer already in progress, stop and reschedule
-+ g_source_remove(abort_timer.id);
-+ }
-+ abort_timer.aborted = FALSE;
-+ abort_timer.priority = abort_priority;
-+ abort_timer.action = abort_action;
-+ abort_timer.text = abort_text;
-+ abort_timer.id = g_timeout_add(delay_ms, abort_timer_popped, NULL);
-+}
-+
- void
- abort_transition_graph(int abort_priority, enum transition_action abort_action,
- const char *abort_text, xmlNode * reason, const char *fn, int line)
-@@ -557,6 +597,8 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
- break;
- }
-
-+ abort_timer.aborted = TRUE;
-+
- /* Make sure any queued calculations are discarded ASAP */
- free(fsa_pe_ref);
- fsa_pe_ref = NULL;
-@@ -660,10 +702,12 @@ abort_transition_graph(int abort_priority, enum transition_action abort_action,
- (transition_graph->complete? "true" : "false"));
-
- } else {
-+ const char *id = ID(reason);
-+
- do_crm_log(level, "Transition aborted by %s.%s '%s': %s "
- CRM_XS " cib=%d.%d.%d source=%s:%d path=%s complete=%s",
-- TYPE(reason), ID(reason), (op? op : "change"), abort_text,
-- add[0], add[1], add[2], fn, line, path,
-+ TYPE(reason), (id? id : ""), (op? op : "change"),
-+ abort_text, add[0], add[1], add[2], fn, line, path,
- (transition_graph->complete? "true" : "false"));
- }
- }
-diff --git a/crmd/tengine.h b/crmd/tengine.h
-index 7205c16..6a75a08 100644
---- a/crmd/tengine.h
-+++ b/crmd/tengine.h
-@@ -59,6 +59,8 @@ extern void notify_crmd(crm_graph_t * graph);
- # include <te_callbacks.h>
-
- extern void trigger_graph_processing(const char *fn, int line);
-+void abort_after_delay(int abort_priority, enum transition_action abort_action,
-+ const char *abort_text, guint delay_ms);
- extern void abort_transition_graph(int abort_priority, enum transition_action abort_action,
- const char *abort_text, xmlNode * reason, const char *fn,
- int line);
---
-1.8.3.1
-
diff --git a/SOURCES/009-crm_resource.patch b/SOURCES/009-crm_resource.patch
deleted file mode 100644
index 9a877e5..0000000
--- a/SOURCES/009-crm_resource.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 30eb9a980db152f6c803a35d3b261a563ad4ee75 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Wed, 24 Jan 2018 10:51:34 -0600
-Subject: [PATCH 1/2] Low: tools: crm_resource --refresh should ignore
- --operation and --interval
-
-It already did when a resource was not specified.
-Also update help text to clarify cleanup vs refresh.
----
- tools/crm_resource.c | 26 ++++++++++++++++-----------
- 1 file changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/tools/crm_resource.c b/tools/crm_resource.c
-index 3fbc6e1..d007668 100644
---- a/tools/crm_resource.c
-+++ b/tools/crm_resource.c
-@@ -212,14 +212,16 @@ static struct crm_option long_options[] = {
- },
- {
- "cleanup", no_argument, NULL, 'C',
-- "\t\tDelete failed operations from a resource's history allowing its current state to be rechecked.\n"
-+ "\t\tIf resource has any past failures, clear its history and fail count.\n"
- "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
-+ "\t\t\t\t--operation and --interval apply to fail counts, but entire history is always cleared,\n"
-+ "\t\t\t\tto allow current state to be rechecked.\n"
- },
- {
- "refresh", no_argument, NULL, 'R',
- "\t\tDelete resource's history (including failures) so its current state is rechecked.\n"
-- "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
-- "\t\t\t\tUnless --force is specified, resource's group or clone (if any) will also be cleaned"
-+ "\t\t\t\tOptionally filtered by --resource and --node (otherwise all).\n"
-+ "\t\t\t\tUnless --force is specified, resource's group or clone (if any) will also be refreshed."
- },
- {
- "set-parameter", required_argument, NULL, 'p',
-@@ -438,7 +440,6 @@ main(int argc, char **argv)
- bool require_resource = TRUE; /* whether command requires that resource be specified */
- bool require_dataset = TRUE; /* whether command requires populated dataset instance */
- bool require_crmd = FALSE; /* whether command requires connection to CRMd */
-- bool just_errors = TRUE; /* whether cleanup command deletes all history or just errors */
-
- int rc = pcmk_ok;
- int is_ocf_rc = 0;
-@@ -630,8 +631,7 @@ main(int argc, char **argv)
- if (cib_file == NULL) {
- require_crmd = TRUE;
- }
-- just_errors = FALSE;
-- rsc_cmd = 'C';
-+ rsc_cmd = 'R';
- find_flags = pe_find_renamed|pe_find_anon;
- break;
-
-@@ -641,7 +641,6 @@ main(int argc, char **argv)
- if (cib_file == NULL) {
- require_crmd = TRUE;
- }
-- just_errors = TRUE;
- rsc_cmd = 'C';
- find_flags = pe_find_renamed|pe_find_anon;
- break;
-@@ -1092,7 +1091,14 @@ main(int argc, char **argv)
- rc = cli_resource_delete_attribute(rsc, rsc_id, prop_set, prop_id,
- prop_name, cib_conn, &data_set);
-
-- } else if ((rsc_cmd == 'C') && rsc) {
-+ } else if (((rsc_cmd == 'C') || (rsc_cmd == 'R')) && rsc) {
-+ bool just_errors = TRUE;
-+
-+ if (rsc_cmd == 'R') {
-+ just_errors = FALSE;
-+ operation = NULL;
-+ interval = 0;
-+ }
- if (do_force == FALSE) {
- rsc = uber_parent(rsc);
- }
-@@ -1113,14 +1119,14 @@ main(int argc, char **argv)
- start_mainloop();
- }
-
-- } else if (rsc_cmd == 'C' && just_errors) {
-+ } else if (rsc_cmd == 'C') {
- rc = cli_cleanup_all(crmd_channel, host_uname, operation, interval,
- &data_set);
- if (rc == pcmk_ok) {
- start_mainloop();
- }
-
-- } else if (rsc_cmd == 'C') {
-+ } else if (rsc_cmd == 'R') {
- #if HAVE_ATOMIC_ATTRD
- const char *router_node = host_uname;
- xmlNode *msg_data = NULL;
---
-1.8.3.1
diff --git a/SOURCES/010-crm_master.patch b/SOURCES/010-crm_master.patch
deleted file mode 100644
index 61d5083..0000000
--- a/SOURCES/010-crm_master.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 18572d4e1e84c9d1f293b9a3082190133367154e Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 26 Jan 2018 12:31:09 -0600
-Subject: [PATCH] Fix: tools: crm_master should always work on node attribute
-
-Before ccbdb2a, crm_master would always set --node, thus ensuring crm_attribute
-would treat the value as a node attribute. That commit removed that so that
-crm_attribute could determine the local node name properly, but that introduced
-an issue where the master value would be set as a cluster property instead of a
-node attribute if --lifetime (or --node) was not set explicitly.
-
-This fixes it by setting the default value of --lifetime explicitly.
----
- tools/crm_master | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/crm_master b/tools/crm_master
-index 7e31cea..f4a0772 100755
---- a/tools/crm_master
-+++ b/tools/crm_master
-@@ -8,6 +8,10 @@ if [ $? != 0 ] ; then echo "crm_master - A convenience wrapper for crm_attribute
- # Note the quotes around `$TEMP': they are essential!
- eval set -- "$TEMP"
-
-+# Explicitly set the (usual default) lifetime, so the attribute gets set as a
-+# node attribute and not a cluster property.
-+options="--lifetime forever"
-+
- while true ; do
- case "$1" in
- -N|--node|-U|--uname) options="$options $1 $2"; shift; shift;;
---
-1.8.3.1
-
diff --git a/SOURCES/011-regression-tests.patch b/SOURCES/011-regression-tests.patch
deleted file mode 100644
index 2610aec..0000000
--- a/SOURCES/011-regression-tests.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From eb76099e924b787ddc026441d87f77871ead9884 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Tue, 13 Feb 2018 17:21:37 -0600
-Subject: [PATCH 1/2] Low: libcrmcommon: use /tmp when creating temporary XML
- file
-
-... instead of CRM_STATE_DIR, which may not be usable from an ordinary user's
-account, thus generating incorrect CLI regression test output when run from a
-checkout.
----
- lib/common/schemas.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/lib/common/schemas.c b/lib/common/schemas.c
-index b529ff5..7e76af3 100644
---- a/lib/common/schemas.c
-+++ b/lib/common/schemas.c
-@@ -625,9 +625,13 @@ validate_xml_verbose(xmlNode *xml_blob)
- xmlDoc *doc = NULL;
- xmlNode *xml = NULL;
- gboolean rc = FALSE;
-- char *filename = strdup(CRM_STATE_DIR "/cib-invalid.XXXXXX");
-+ const char *tmpdir = getenv("TMPDIR");
-+ char *filename = NULL;
-
-- CRM_CHECK(filename != NULL, return FALSE);
-+ if ((tmpdir == NULL) || (*tmpdir != '/')) {
-+ tmpdir = "/tmp";
-+ }
-+ filename = crm_strdup_printf("%s/cib-invalid.XXXXXX", tmpdir);
-
- umask(S_IWGRP | S_IWOTH | S_IROTH);
- fd = mkstemp(filename);
---
-1.8.3.1
-
-
-From 48c9a80a7c3a621bd606ffcc14ae8a86072e41e0 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Tue, 13 Feb 2018 17:24:04 -0600
-Subject: [PATCH 2/2] Test: tools: update regression test with correct output
-
-Verbose XML wasn't been shown from an ordinary user's checkout previously due
-to a bug that has since been fixed.
----
- tools/regression.validity.exp | 46 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/tools/regression.validity.exp b/tools/regression.validity.exp
-index 7474746..7557454 100644
---- a/tools/regression.validity.exp
-+++ b/tools/regression.validity.exp
-@@ -3,6 +3,21 @@ Setting up shadow instance
- A new shadow instance was created. To begin using it paste the following into your shell:
- CIB_shadow=tools-regression ; export CIB_shadow
- =#=#=#= Begin test: Try to make resulting CIB invalid (enum violation) =#=#=#=
-+ 1 <cib epoch="4" num_updates="0" admin_epoch="0">
-+ 2 <configuration>
-+ 3 <crm_config/>
-+ 4 <nodes/>
-+ 5 <resources>
-+ 6 <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-+ 7 <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-+ 8 </resources>
-+ 9 <constraints>
-+ 10 <rsc_order id="ord_1-2" first="dummy1" first-action="break" then="dummy2"/>
-+ 11 </constraints>
-+ 12 </configuration>
-+ 13 <status/>
-+ 14 </cib>
-+ 15
- Call failed: Update does not conform to the configured schema
- =#=#=#= Current cib after: Try to make resulting CIB invalid (enum violation) =#=#=#=
- <cib epoch="3" num_updates="0" admin_epoch="0">
-@@ -78,6 +93,21 @@ Your current configuration pacemaker-1.2 could not validate with any schema in r
- =#=#=#= End test: Run crm_simulate with invalid CIB (enum violation) - Required key not available (126) =#=#=#=
- * Passed: crm_simulate - Run crm_simulate with invalid CIB (enum violation)
- =#=#=#= Begin test: Try to make resulting CIB invalid (unrecognized validate-with) =#=#=#=
-+ 1 <cib epoch="3" num_updates="1" admin_epoch="0">
-+ 2 <configuration>
-+ 3 <crm_config/>
-+ 4 <nodes/>
-+ 5 <resources>
-+ 6 <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-+ 7 <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-+ 8 </resources>
-+ 9 <constraints>
-+ 10 <rsc_order id="ord_1-2" first="dummy1" first-action="start" then="dummy2"/>
-+ 11 </constraints>
-+ 12 </configuration>
-+ 13 <status/>
-+ 14 </cib>
-+ 15
- Call failed: Update does not conform to the configured schema
- =#=#=#= Current cib after: Try to make resulting CIB invalid (unrecognized validate-with) =#=#=#=
- <cib epoch="3" num_updates="0" admin_epoch="0">
-@@ -161,6 +191,22 @@ Your current configuration pacemaker-9999.0 could not validate with any schema i
- =#=#=#= End test: Run crm_simulate with invalid CIB (unrecognized validate-with) - Required key not available (126) =#=#=#=
- * Passed: crm_simulate - Run crm_simulate with invalid CIB (unrecognized validate-with)
- =#=#=#= Begin test: Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1) =#=#=#=
-+ 1 <cib epoch="3" num_updates="0" admin_epoch="0">
-+ 2 <configuration>
-+ 3 <crm_config/>
-+ 4 <nodes/>
-+ 5 <resources>
-+ 6 <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-+ 7 <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-+ 8 </resources>
-+ 9 <constraints>
-+ 10 <rsc_order id="ord_1-2" first="dummy1" first-action="start" then="dummy2"/>
-+ 11 </constraints>
-+ 12 <tags/>
-+ 13 </configuration>
-+ 14 <status/>
-+ 15 </cib>
-+ 16
- Call failed: Update does not conform to the configured schema
- =#=#=#= Current cib after: Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1) =#=#=#=
- <cib epoch="3" num_updates="0" admin_epoch="0">
---
-1.8.3.1
-
diff --git a/SOURCES/012-notifs.patch b/SOURCES/012-notifs.patch
deleted file mode 100644
index b121780..0000000
--- a/SOURCES/012-notifs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 191c5be52b1633a8642d28868505a9879b5d5622 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Tue, 3 Apr 2018 13:56:22 +1000
-Subject: [PATCH] Fix: rhbz#1545449 - Do not perform notifications for events
- we know wont be executed
-
----
- pengine/notif.c | 40 +++++++++++++++++++++++++++++++++++++---
- 1 file changed, 37 insertions(+), 3 deletions(-)
-
-diff --git a/pengine/notif.c b/pengine/notif.c
-index 39d8c72..7ce8f57 100644
---- a/pengine/notif.c
-+++ b/pengine/notif.c
-@@ -498,12 +498,18 @@ collect_notification_data(resource_t * rsc, gboolean state, gboolean activity,
- action_t *op = (action_t *) gIter->data;
-
- if (is_set(op->flags, pe_action_optional) == FALSE && op->node != NULL) {
-+ task = text2task(op->task);
-+
-+ if(task == stop_rsc && op->node->details->unclean) {
-+ /* Create one anyway,, some additional noise if op->node cannot be fenced */
-+ } else if(is_not_set(op->flags, pe_action_runnable)) {
-+ continue;
-+ }
-
- entry = calloc(1, sizeof(notify_entry_t));
- entry->node = op->node;
- entry->rsc = rsc;
-
-- task = text2task(op->task);
- switch (task) {
- case start_rsc:
- n_data->start = g_list_prepend(n_data->start, entry);
-@@ -656,8 +662,7 @@ create_notifications(resource_t * rsc, notify_data_t * n_data, pe_working_set_t
-
- /* Copy notification details into standard ops */
-
-- gIter = rsc->actions;
-- for (; gIter != NULL; gIter = gIter->next) {
-+ for (gIter = rsc->actions; gIter != NULL; gIter = gIter->next) {
- action_t *op = (action_t *) gIter->data;
-
- if (is_set(op->flags, pe_action_optional) == FALSE && op->node != NULL) {
-@@ -676,6 +681,35 @@ create_notifications(resource_t * rsc, notify_data_t * n_data, pe_working_set_t
- }
- }
-
-+ switch (task) {
-+ case start_rsc:
-+ if(g_list_length(n_data->start) == 0) {
-+ pe_rsc_trace(rsc, "Skipping empty notification for: %s.%s (%s->%s)",
-+ n_data->action, rsc->id, role2text(rsc->role), role2text(rsc->next_role));
-+ return;
-+ }
-+ break;
-+ case action_promote:
-+ if(g_list_length(n_data->promote) == 0) {
-+ pe_rsc_trace(rsc, "Skipping empty notification for: %s.%s (%s->%s)",
-+ n_data->action, rsc->id, role2text(rsc->role), role2text(rsc->next_role));
-+ return;
-+ }
-+ break;
-+ case action_demote:
-+ if(g_list_length(n_data->demote) == 0) {
-+ pe_rsc_trace(rsc, "Skipping empty notification for: %s.%s (%s->%s)",
-+ n_data->action, rsc->id, role2text(rsc->role), role2text(rsc->next_role));
-+ return;
-+ }
-+ break;
-+ default:
-+ /* We cannot do the same for stop_rsc/n_data->stop at it
-+ * might be implied by fencing
-+ */
-+ break;
-+ }
-+
- pe_rsc_trace(rsc, "Creating notifications for: %s.%s (%s->%s)",
- n_data->action, rsc->id, role2text(rsc->role), role2text(rsc->next_role));
-
---
-1.8.3.1
-
diff --git a/SOURCES/013-notifs-tests.patch b/SOURCES/013-notifs-tests.patch
deleted file mode 100644
index 2565eb9..0000000
--- a/SOURCES/013-notifs-tests.patch
+++ /dev/null
@@ -1,5310 +0,0 @@
-From ef683f4767d75aae7a9483b1c325b13fc39f2821 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Fri, 6 Apr 2018 12:53:26 -0500
-Subject: [PATCH] Test: pengine: update regression tests for notification
- changes
-
----
- pengine/test10/a-demote-then-b-migrate.exp | 32 +-
- pengine/test10/a-promote-then-b-migrate.exp | 16 +-
- pengine/test10/bug-1572-2.exp | 28 +-
- pengine/test10/bug-1685.exp | 16 +-
- pengine/test10/bug-5143-ms-shuffle.exp | 16 +-
- pengine/test10/bug-cl-5168.exp | 16 +-
- pengine/test10/bug-cl-5212.exp | 12 +-
- pengine/test10/bug-cl-5247.exp | 12 +-
- pengine/test10/bug-lf-2153.exp | 12 +-
- pengine/test10/bug-lf-2317.exp | 16 +-
- pengine/test10/bundle-order-fencing.dot | 34 --
- pengine/test10/bundle-order-fencing.exp | 527 +++++++--------------
- pengine/test10/bundle-order-fencing.summary | 10 -
- pengine/test10/bundle-order-partial-start-2.exp | 8 +-
- pengine/test10/bundle-order-partial-start.exp | 8 +-
- pengine/test10/bundle-order-partial-stop.dot | 3 -
- pengine/test10/bundle-order-partial-stop.exp | 14 +-
- pengine/test10/bundle-order-startup-clone.dot | 3 -
- pengine/test10/bundle-order-stop-clone.exp | 20 +-
- pengine/test10/bundle-order-stop-on-remote.exp | 44 +-
- pengine/test10/bundle-order-stop.dot | 3 -
- pengine/test10/bundle-order-stop.exp | 14 +-
- pengine/test10/colo_master_w_native.exp | 32 +-
- pengine/test10/colo_slave_w_native.exp | 32 +-
- pengine/test10/group-dependents.exp | 32 +-
- pengine/test10/inc10.exp | 28 +-
- pengine/test10/interleave-pseudo-stop.exp | 12 +-
- pengine/test10/interleave-stop.exp | 36 +-
- pengine/test10/master-13.exp | 32 +-
- pengine/test10/master-demote.exp | 16 +-
- pengine/test10/master-dependent-ban.exp | 16 +-
- pengine/test10/master-failed-demote.exp | 36 +-
- pengine/test10/master-move.exp | 32 +-
- pengine/test10/master-notify.exp | 24 +-
- pengine/test10/master-partially-demoted-group.exp | 32 +-
- pengine/test10/novell-239082.exp | 36 +-
- pengine/test10/novell-252693.exp | 36 +-
- .../test10/one-or-more-unrunnable-instances.exp | 12 +-
- pengine/test10/order_constraint_stops_master.dot | 1 -
- pengine/test10/order_constraint_stops_master.exp | 10 +-
- pengine/test10/order_constraint_stops_slave.dot | 1 -
- pengine/test10/order_constraint_stops_slave.exp | 4 +-
- pengine/test10/probe-0.exp | 8 +-
- pengine/test10/probe-2.exp | 48 +-
- pengine/test10/remote-recover-all.exp | 8 +-
- pengine/test10/remote-recover-connection.exp | 8 +-
- pengine/test10/remote-recover-no-resources.exp | 8 +-
- pengine/test10/remote-recover-unknown.exp | 8 +-
- pengine/test10/remote-recovery.exp | 8 +-
- 49 files changed, 719 insertions(+), 922 deletions(-)
-
-diff --git a/pengine/test10/a-demote-then-b-migrate.exp b/pengine/test10/a-demote-then-b-migrate.exp
-index 2b12db2..e31e125 100644
---- a/pengine/test10/a-demote-then-b-migrate.exp
-+++ b/pengine/test10/a-demote-then-b-migrate.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="57" operation="notify" operation_key="rsc1:1_post_notify_demote_0" internal_operation_key="rsc1:0_post_notify_demote_0" on_node="node1" on_node_uuid="node1">
-+ <rsc_op id="53" operation="notify" operation_key="rsc1:1_post_notify_demote_0" internal_operation_key="rsc1:0_post_notify_demote_0" on_node="node1" on_node_uuid="node1">
- <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="56" operation="notify" operation_key="rsc1:1_pre_notify_demote_0" internal_operation_key="rsc1:0_pre_notify_demote_0" on_node="node1" on_node_uuid="node1">
-+ <rsc_op id="52" operation="notify" operation_key="rsc1:1_pre_notify_demote_0" internal_operation_key="rsc1:0_pre_notify_demote_0" on_node="node1" on_node_uuid="node1">
- <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="rsc1:1_post_notify_promote_0" internal_operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
-+ <rsc_op id="49" operation="notify" operation_key="rsc1:1_post_notify_promote_0" internal_operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
- <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" internal_operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
-+ <rsc_op id="48" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" internal_operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
- <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -97,7 +97,7 @@
- </synapse>
- <synapse id="7" priority="1000000">
- <action_set>
-- <rsc_op id="59" operation="notify" operation_key="rsc1:0_post_notify_demote_0" internal_operation_key="rsc1:1_post_notify_demote_0" on_node="node2" on_node_uuid="node2">
-+ <rsc_op id="55" operation="notify" operation_key="rsc1:0_post_notify_demote_0" internal_operation_key="rsc1:1_post_notify_demote_0" on_node="node2" on_node_uuid="node2">
- <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -110,7 +110,7 @@
- </synapse>
- <synapse id="8">
- <action_set>
-- <rsc_op id="58" operation="notify" operation_key="rsc1:0_pre_notify_demote_0" internal_operation_key="rsc1:1_pre_notify_demote_0" on_node="node2" on_node_uuid="node2">
-+ <rsc_op id="54" operation="notify" operation_key="rsc1:0_pre_notify_demote_0" internal_operation_key="rsc1:1_pre_notify_demote_0" on_node="node2" on_node_uuid="node2">
- <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -123,7 +123,7 @@
- </synapse>
- <synapse id="9" priority="1000000">
- <action_set>
-- <rsc_op id="55" operation="notify" operation_key="rsc1:0_post_notify_promote_0" internal_operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
-+ <rsc_op id="51" operation="notify" operation_key="rsc1:0_post_notify_promote_0" internal_operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
- <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -136,7 +136,7 @@
- </synapse>
- <synapse id="10">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" internal_operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
-+ <rsc_op id="50" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" internal_operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
- <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -202,10 +202,10 @@
- <pseudo_event id="35" operation="notify" operation_key="ms1_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="57" operation="notify" operation_key="rsc1:1_post_notify_demote_0" internal_operation_key="rsc1:0_post_notify_demote_0" on_node="node1" on_node_uuid="node1"/>
-+ <rsc_op id="53" operation="notify" operation_key="rsc1:1_post_notify_demote_0" internal_operation_key="rsc1:0_post_notify_demote_0" on_node="node1" on_node_uuid="node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="59" operation="notify" operation_key="rsc1:0_post_notify_demote_0" internal_operation_key="rsc1:1_post_notify_demote_0" on_node="node2" on_node_uuid="node2"/>
-+ <rsc_op id="55" operation="notify" operation_key="rsc1:0_post_notify_demote_0" internal_operation_key="rsc1:1_post_notify_demote_0" on_node="node2" on_node_uuid="node2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -235,10 +235,10 @@
- <pseudo_event id="33" operation="notify" operation_key="ms1_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="56" operation="notify" operation_key="rsc1:1_pre_notify_demote_0" internal_operation_key="rsc1:0_pre_notify_demote_0" on_node="node1" on_node_uuid="node1"/>
-+ <rsc_op id="52" operation="notify" operation_key="rsc1:1_pre_notify_demote_0" internal_operation_key="rsc1:0_pre_notify_demote_0" on_node="node1" on_node_uuid="node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="58" operation="notify" operation_key="rsc1:0_pre_notify_demote_0" internal_operation_key="rsc1:1_pre_notify_demote_0" on_node="node2" on_node_uuid="node2"/>
-+ <rsc_op id="54" operation="notify" operation_key="rsc1:0_pre_notify_demote_0" internal_operation_key="rsc1:1_pre_notify_demote_0" on_node="node2" on_node_uuid="node2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -288,10 +288,10 @@
- <pseudo_event id="29" operation="notify" operation_key="ms1_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="rsc1:1_post_notify_promote_0" internal_operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
-+ <rsc_op id="49" operation="notify" operation_key="rsc1:1_post_notify_promote_0" internal_operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="55" operation="notify" operation_key="rsc1:0_post_notify_promote_0" internal_operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
-+ <rsc_op id="51" operation="notify" operation_key="rsc1:0_post_notify_promote_0" internal_operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -321,10 +321,10 @@
- <pseudo_event id="27" operation="notify" operation_key="ms1_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" internal_operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
-+ <rsc_op id="48" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" internal_operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" internal_operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
-+ <rsc_op id="50" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" internal_operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/a-promote-then-b-migrate.exp b/pengine/test10/a-promote-then-b-migrate.exp
-index 26cd1b1..f5ef735 100644
---- a/pengine/test10/a-promote-then-b-migrate.exp
-+++ b/pengine/test10/a-promote-then-b-migrate.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
-+ <rsc_op id="48" operation="notify" operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
- <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="51" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
-+ <rsc_op id="47" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
- <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
-+ <rsc_op id="50" operation="notify" operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
- <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
-+ <rsc_op id="49" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
- <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -103,10 +103,10 @@
- <pseudo_event id="29" operation="notify" operation_key="ms1_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
-+ <rsc_op id="48" operation="notify" operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
-+ <rsc_op id="50" operation="notify" operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -136,10 +136,10 @@
- <pseudo_event id="27" operation="notify" operation_key="ms1_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="51" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
-+ <rsc_op id="47" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
-+ <rsc_op id="49" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-1572-2.exp b/pengine/test10/bug-1572-2.exp
-index a854f62..58885e2 100644
---- a/pengine/test10/bug-1572-2.exp
-+++ b/pengine/test10/bug-1572-2.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
-+ <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
-+ <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
-+ <rsc_op id="50" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4" priority="1000000">
- <action_set>
-- <rsc_op id="58" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
-+ <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -66,7 +66,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="57" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
-+ <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -79,7 +79,7 @@
- </synapse>
- <synapse id="6" priority="1000000">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
-+ <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -92,7 +92,7 @@
- </synapse>
- <synapse id="7">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
-+ <rsc_op id="51" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
- <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000" drbd_resource="pgsql" dummy="cause_restart"/>
- </rsc_op>
-@@ -127,10 +127,10 @@
- <pseudo_event id="30" operation="notify" operation_key="ms_drbd_7788_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042"/>
-+ <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042"/>
- </trigger>
- <trigger>
-- <rsc_op id="58" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
-+ <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -160,10 +160,10 @@
- <pseudo_event id="28" operation="notify" operation_key="ms_drbd_7788_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042"/>
-+ <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042"/>
- </trigger>
- <trigger>
-- <rsc_op id="57" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
-+ <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -216,7 +216,7 @@
- <pseudo_event id="18" operation="notify" operation_key="ms_drbd_7788_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
-+ <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -246,10 +246,10 @@
- <pseudo_event id="16" operation="notify" operation_key="ms_drbd_7788_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042"/>
-+ <rsc_op id="50" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
-+ <rsc_op id="51" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-1685.exp b/pengine/test10/bug-1685.exp
-index 8b46500..7d6f29b 100644
---- a/pengine/test10/bug-1685.exp
-+++ b/pengine/test10/bug-1685.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="48" operation="notify" operation_key="prim_shared_storage:0_post_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
-+ <rsc_op id="44" operation="notify" operation_key="prim_shared_storage:0_post_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
- <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage: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="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="20000" drbd_resource="sip-shared"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="47" operation="notify" operation_key="prim_shared_storage:0_pre_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
-+ <rsc_op id="43" operation="notify" operation_key="prim_shared_storage:0_pre_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
- <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage: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="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="20000" drbd_resource="sip-shared"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="50" operation="notify" operation_key="prim_shared_storage:1_post_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
-+ <rsc_op id="46" operation="notify" operation_key="prim_shared_storage:1_post_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
- <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage: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="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="redun1" CRM_meta_on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13" CRM_meta_timeout="20000" drbd_resource="sip-shared"/>
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="49" operation="notify" operation_key="prim_shared_storage:1_pre_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
-+ <rsc_op id="45" operation="notify" operation_key="prim_shared_storage:1_pre_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
- <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage: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="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="redun1" CRM_meta_on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13" CRM_meta_timeout="20000" drbd_resource="sip-shared"/>
- </rsc_op>
-@@ -88,10 +88,10 @@
- <pseudo_event id="24" operation="notify" operation_key="shared_storage_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="48" operation="notify" operation_key="prim_shared_storage:0_post_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1"/>
-+ <rsc_op id="44" operation="notify" operation_key="prim_shared_storage:0_post_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1"/>
- </trigger>
- <trigger>
-- <rsc_op id="50" operation="notify" operation_key="prim_shared_storage:1_post_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13"/>
-+ <rsc_op id="46" operation="notify" operation_key="prim_shared_storage:1_post_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -121,10 +121,10 @@
- <pseudo_event id="22" operation="notify" operation_key="shared_storage_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="47" operation="notify" operation_key="prim_shared_storage:0_pre_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1"/>
-+ <rsc_op id="43" operation="notify" operation_key="prim_shared_storage:0_pre_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1"/>
- </trigger>
- <trigger>
-- <rsc_op id="49" operation="notify" operation_key="prim_shared_storage:1_pre_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13"/>
-+ <rsc_op id="45" operation="notify" operation_key="prim_shared_storage:1_pre_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-5143-ms-shuffle.exp b/pengine/test10/bug-5143-ms-shuffle.exp
-index e8fb58c..caa1474 100644
---- a/pengine/test10/bug-5143-ms-shuffle.exp
-+++ b/pengine/test10/bug-5143-ms-shuffle.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="184" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
-+ <rsc_op id="168" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
- <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="183" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
-+ <rsc_op id="167" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
- <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
-+ <rsc_op id="170" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
- <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
-+ <rsc_op id="169" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
- <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -104,10 +104,10 @@
- <pseudo_event id="119" operation="notify" operation_key="ms-r1_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="184" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
-+ <rsc_op id="168" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
- </trigger>
- <trigger>
-- <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
-+ <rsc_op id="170" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -137,10 +137,10 @@
- <pseudo_event id="117" operation="notify" operation_key="ms-r1_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="183" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
-+ <rsc_op id="167" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
- </trigger>
- <trigger>
-- <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
-+ <rsc_op id="169" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-cl-5168.exp b/pengine/test10/bug-cl-5168.exp
-index f4b3b79..729c7a6 100644
---- a/pengine/test10/bug-cl-5168.exp
-+++ b/pengine/test10/bug-cl-5168.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
-+ <rsc_op id="170" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
- <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1: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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
-+ <rsc_op id="169" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
- <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1: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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="188" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
-+ <rsc_op id="172" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
- <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1: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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="187" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
-+ <rsc_op id="171" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
- <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1: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="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000" drbd_resource="r1"/>
- </rsc_op>
-@@ -104,10 +104,10 @@
- <pseudo_event id="147" operation="notify" operation_key="ms-r1_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
-+ <rsc_op id="170" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
- </trigger>
- <trigger>
-- <rsc_op id="188" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
-+ <rsc_op id="172" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -137,10 +137,10 @@
- <pseudo_event id="145" operation="notify" operation_key="ms-r1_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
-+ <rsc_op id="169" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2"/>
- </trigger>
- <trigger>
-- <rsc_op id="187" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
-+ <rsc_op id="171" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-cl-5212.exp b/pengine/test10/bug-cl-5212.exp
-index 344711b..4ee6d88 100644
---- a/pengine/test10/bug-cl-5212.exp
-+++ b/pengine/test10/bug-cl-5212.exp
-@@ -41,9 +41,9 @@
- </synapse>
- <synapse id="5" priority="1000000">
- <action_set>
-- <rsc_op id="74" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
-+ <rsc_op id="72" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
- <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
-+ <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="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -54,9 +54,9 @@
- </synapse>
- <synapse id="6">
- <action_set>
-- <rsc_op id="73" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
-+ <rsc_op id="71" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
- <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
-+ <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="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -76,7 +76,7 @@
- <pseudo_event id="40" operation="notify" operation_key="msPostgresql_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="74" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
-+ <rsc_op id="72" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -106,7 +106,7 @@
- <pseudo_event id="38" operation="notify" operation_key="msPostgresql_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="73" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
-+ <rsc_op id="71" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp
-index 7f55c64..c21ed7d 100644
---- a/pengine/test10/bug-cl-5247.exp
-+++ b/pengine/test10/bug-cl-5247.exp
-@@ -451,7 +451,7 @@
- </synapse>
- <synapse id="31" priority="1000000">
- <action_set>
-- <rsc_op id="85" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
-+ <rsc_op id="81" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
- <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_physical_host="bl460g8n3" CRM_meta_timeout="60000" />
- </rsc_op>
-@@ -464,7 +464,7 @@
- </synapse>
- <synapse id="32">
- <action_set>
-- <rsc_op id="84" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
-+ <rsc_op id="80" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
- <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_physical_host="bl460g8n3" CRM_meta_timeout="60000" />
- </rsc_op>
-@@ -477,7 +477,7 @@
- </synapse>
- <synapse id="33">
- <action_set>
-- <rsc_op id="81" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
-+ <rsc_op id="79" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
- <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_physical_host="bl460g8n3" CRM_meta_timeout="60000" />
- </rsc_op>
-@@ -534,7 +534,7 @@
- <pseudo_event id="66" operation="notify" operation_key="msPostgresql_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="85" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
-+ <rsc_op id="81" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -564,7 +564,7 @@
- <pseudo_event id="64" operation="notify" operation_key="msPostgresql_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="84" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
-+ <rsc_op id="80" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -644,7 +644,7 @@
- <pseudo_event id="52" operation="notify" operation_key="msPostgresql_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="81" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
-+ <rsc_op id="79" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-lf-2153.exp b/pengine/test10/bug-lf-2153.exp
-index abe1554..6b8713c 100644
---- a/pengine/test10/bug-lf-2153.exp
-+++ b/pengine/test10/bug-lf-2153.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0">
- <action_set>
-- <rsc_op id="69" operation="notify" operation_key="res_drbd_iscsivg01:0_pre_notify_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
-+ <rsc_op id="67" operation="notify" operation_key="res_drbd_iscsivg01:0_pre_notify_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
- <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_on_node="bob" CRM_meta_on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af" CRM_meta_timeout="20000" drbd_resource="iscsivg01"/>
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="71" operation="notify" operation_key="res_drbd_iscsivg01:1_post_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
-+ <rsc_op id="69" operation="notify" operation_key="res_drbd_iscsivg01:1_post_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
- <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="post" CRM_meta_on_node="alice" CRM_meta_on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e" CRM_meta_timeout="20000" drbd_resource="iscsivg01"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="70" operation="notify" operation_key="res_drbd_iscsivg01:1_pre_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
-+ <rsc_op id="68" operation="notify" operation_key="res_drbd_iscsivg01:1_pre_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
- <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_on_node="alice" CRM_meta_on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e" CRM_meta_timeout="20000" drbd_resource="iscsivg01"/>
- </rsc_op>
-@@ -62,7 +62,7 @@
- <pseudo_event id="24" operation="notify" operation_key="ms_drbd_iscsivg01_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="71" operation="notify" operation_key="res_drbd_iscsivg01:1_post_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e"/>
-+ <rsc_op id="69" operation="notify" operation_key="res_drbd_iscsivg01:1_post_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -92,10 +92,10 @@
- <pseudo_event id="22" operation="notify" operation_key="ms_drbd_iscsivg01_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="69" operation="notify" operation_key="res_drbd_iscsivg01:0_pre_notify_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af"/>
-+ <rsc_op id="67" operation="notify" operation_key="res_drbd_iscsivg01:0_pre_notify_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af"/>
- </trigger>
- <trigger>
-- <rsc_op id="70" operation="notify" operation_key="res_drbd_iscsivg01:1_pre_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e"/>
-+ <rsc_op id="68" operation="notify" operation_key="res_drbd_iscsivg01:1_pre_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bug-lf-2317.exp b/pengine/test10/bug-lf-2317.exp
-index cf84cd5..a50bce3 100644
---- a/pengine/test10/bug-lf-2317.exp
-+++ b/pengine/test10/bug-lf-2317.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="49" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
-+ <rsc_op id="45" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
- <primitive id="drbd_r0" long-id="drbd_r0:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" 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="ibm2.isg.si" CRM_meta_on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7" CRM_meta_timeout="90000" drbd_resource="r0"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="48" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
-+ <rsc_op id="44" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
- <primitive id="drbd_r0" long-id="drbd_r0:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" 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="ibm2.isg.si" CRM_meta_on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7" CRM_meta_timeout="90000" drbd_resource="r0"/>
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="51" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
-+ <rsc_op id="47" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
- <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" 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="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_timeout="90000" drbd_resource="r0"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="50" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
-+ <rsc_op id="46" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
- <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" 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="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_timeout="90000" drbd_resource="r0"/>
- </rsc_op>
-@@ -103,10 +103,10 @@
- <pseudo_event id="31" operation="notify" operation_key="ms_drbd_r0_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="49" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7"/>
-+ <rsc_op id="45" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7"/>
- </trigger>
- <trigger>
-- <rsc_op id="51" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
-+ <rsc_op id="47" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -136,10 +136,10 @@
- <pseudo_event id="29" operation="notify" operation_key="ms_drbd_r0_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="48" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7"/>
-+ <rsc_op id="44" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7"/>
- </trigger>
- <trigger>
-- <rsc_op id="50" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
-+ <rsc_op id="46" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot
-index 980bab4..e53a062 100644
---- a/pengine/test10/bundle-order-fencing.dot
-+++ b/pengine/test10/bundle-order-fencing.dot
-@@ -114,7 +114,6 @@ digraph "g" {
- "rabbitmq-bundle-1_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"]
- "rabbitmq-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"]
- "rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq-bundle_running_0" [ style = bold]
--"rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed]
- "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
- "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
- "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = bold]
-@@ -127,17 +126,12 @@ digraph "g" {
- "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" -> "rabbitmq-bundle-clone_stop_0" [ style = bold]
- "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
- "rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold]
--"rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq_post_notify_running_0 rabbitmq-bundle-0" [ style = bold]
--"rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq_post_notify_running_0 rabbitmq-bundle-1" [ style = bold]
--"rabbitmq-bundle-clone_post_notify_running_0" -> "rabbitmq_post_notify_running_0 rabbitmq-bundle-2" [ style = bold]
- "rabbitmq-bundle-clone_post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
- "rabbitmq-bundle-clone_post_notify_stopped_0" -> "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style = bold]
- "rabbitmq-bundle-clone_post_notify_stopped_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" [ style = bold]
- "rabbitmq-bundle-clone_post_notify_stopped_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-2" [ style = bold]
- "rabbitmq-bundle-clone_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
- "rabbitmq-bundle-clone_pre_notify_start_0" -> "rabbitmq-bundle-clone_confirmed-pre_notify_start_0" [ style = bold]
--"rabbitmq-bundle-clone_pre_notify_start_0" -> "rabbitmq_pre_notify_start_0 rabbitmq-bundle-1" [ style = bold]
--"rabbitmq-bundle-clone_pre_notify_start_0" -> "rabbitmq_pre_notify_start_0 rabbitmq-bundle-2" [ style = bold]
- "rabbitmq-bundle-clone_pre_notify_start_0" [ style=bold color="green" fontcolor="orange"]
- "rabbitmq-bundle-clone_pre_notify_stop_0" -> "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style = bold]
- "rabbitmq-bundle-clone_pre_notify_stop_0" -> "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-1" [ style = bold]
-@@ -168,12 +162,6 @@ digraph "g" {
- "rabbitmq_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold]
- "rabbitmq_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"]
- "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"]
--"rabbitmq_post_notify_running_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold]
--"rabbitmq_post_notify_running_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="black"]
--"rabbitmq_post_notify_running_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold]
--"rabbitmq_post_notify_running_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"]
--"rabbitmq_post_notify_running_0 rabbitmq-bundle-2" -> "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style = bold]
--"rabbitmq_post_notify_running_0 rabbitmq-bundle-2" [ style=bold color="green" fontcolor="black"]
- "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style = bold]
- "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" -> "rabbitmq_confirmed-post_notify_stonith_0" [ style = bold]
- "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"]
-@@ -184,10 +172,6 @@ digraph "g" {
- "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" [ style = bold]
- "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-2" [ style = bold]
- "rabbitmq_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"]
--"rabbitmq_pre_notify_start_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-pre_notify_start_0" [ style = bold]
--"rabbitmq_pre_notify_start_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"]
--"rabbitmq_pre_notify_start_0 rabbitmq-bundle-2" -> "rabbitmq-bundle-clone_confirmed-pre_notify_start_0" [ style = bold]
--"rabbitmq_pre_notify_start_0 rabbitmq-bundle-2" [ style=bold color="green" fontcolor="black"]
- "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style = bold]
- "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-1" [ style=bold color="green" fontcolor="black"]
- "rabbitmq_pre_notify_stop_0 rabbitmq-bundle-2" -> "rabbitmq-bundle-clone_confirmed-pre_notify_stop_0" [ style = bold]
-@@ -231,9 +215,6 @@ digraph "g" {
- "redis-bundle-master_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"]
- "redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold]
- "redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle_running_0" [ style = bold]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_20000 redis-bundle-1" [ style = bold]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
- "redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
- "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold]
-@@ -271,9 +252,6 @@ digraph "g" {
- "redis-bundle-master_post_notify_promoted_0" -> "redis_post_notify_promoted_0 redis-bundle-2" [ style = bold]
- "redis-bundle-master_post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"]
- "redis-bundle-master_post_notify_running_0" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
--"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-0" [ style = bold]
--"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-1" [ style = bold]
--"redis-bundle-master_post_notify_running_0" -> "redis_post_notify_running_0 redis-bundle-2" [ style = bold]
- "redis-bundle-master_post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
- "redis-bundle-master_post_notify_stopped_0" -> "redis-bundle-master_confirmed-post_notify_stopped_0" [ style = bold]
- "redis-bundle-master_post_notify_stopped_0" -> "redis_post_notify_stonith_0 redis-bundle-1" [ style = bold]
-@@ -289,8 +267,6 @@ digraph "g" {
- "redis-bundle-master_pre_notify_promote_0" -> "redis_pre_notify_promote_0 redis-bundle-2" [ style = bold]
- "redis-bundle-master_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange"]
- "redis-bundle-master_pre_notify_start_0" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold]
--"redis-bundle-master_pre_notify_start_0" -> "redis_pre_notify_start_0 redis-bundle-1" [ style = bold]
--"redis-bundle-master_pre_notify_start_0" -> "redis_pre_notify_start_0 redis-bundle-2" [ style = bold]
- "redis-bundle-master_pre_notify_start_0" [ style=bold color="green" fontcolor="orange"]
- "redis-bundle-master_pre_notify_stop_0" -> "redis-bundle-master_confirmed-pre_notify_stop_0" [ style = bold]
- "redis-bundle-master_pre_notify_stop_0" -> "redis_pre_notify_stop_0 redis-bundle-1" [ style = bold]
-@@ -355,12 +331,6 @@ digraph "g" {
- "redis_post_notify_promoted_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
- "redis_post_notify_promoted_0 redis-bundle-2" -> "redis-bundle-master_confirmed-post_notify_promoted_0" [ style = bold]
- "redis_post_notify_promoted_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
--"redis_post_notify_running_0 redis-bundle-0" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
--"redis_post_notify_running_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
--"redis_post_notify_running_0 redis-bundle-1" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
--"redis_post_notify_running_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
--"redis_post_notify_running_0 redis-bundle-2" -> "redis-bundle-master_confirmed-post_notify_running_0" [ style = bold]
--"redis_post_notify_running_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
- "redis_post_notify_stonith_0 redis-bundle-1" -> "redis-bundle-master_confirmed-post_notify_stopped_0" [ style = bold]
- "redis_post_notify_stonith_0 redis-bundle-1" -> "redis_confirmed-post_notify_stonith_0" [ style = bold]
- "redis_post_notify_stonith_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
-@@ -381,10 +351,6 @@ digraph "g" {
- "redis_pre_notify_promote_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
- "redis_pre_notify_promote_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_promote_0" [ style = bold]
- "redis_pre_notify_promote_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
--"redis_pre_notify_start_0 redis-bundle-1" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold]
--"redis_pre_notify_start_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
--"redis_pre_notify_start_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_start_0" [ style = bold]
--"redis_pre_notify_start_0 redis-bundle-2" [ style=bold color="green" fontcolor="black"]
- "redis_pre_notify_stop_0 redis-bundle-1" -> "redis-bundle-master_confirmed-pre_notify_stop_0" [ style = bold]
- "redis_pre_notify_stop_0 redis-bundle-1" [ style=bold color="green" fontcolor="black"]
- "redis_pre_notify_stop_0 redis-bundle-2" -> "redis-bundle-master_confirmed-pre_notify_stop_0" [ style = bold]
-diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp
-index dc4c5c9..599c299 100644
---- a/pengine/test10/bundle-order-fencing.exp
-+++ b/pengine/test10/bundle-order-fencing.exp
-@@ -1,19 +1,6 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="226" operation="notify" operation_key="rabbitmq_post_notify_start_0" internal_operation_key="rabbitmq:0_post_notify_start_0" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0" router_node="controller-1">
-- <primitive id="rabbitmq" long-id="rabbitmq:0" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-- </rsc_op>
-- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="69" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="1" priority="1000000">
-- <action_set>
- <pseudo_event id="211" operation="notified" operation_key="rabbitmq_notified_0" internal_operation_key="rabbitmq:0_confirmed-post_notify_stonith_0">
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </pseudo_event>
-@@ -30,7 +17,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="2" priority="1000000">
-+ <synapse id="1" priority="1000000">
- <action_set>
- <pseudo_event id="210" operation="notify" operation_key="rabbitmq_post_notify_stop_0" internal_operation_key="rabbitmq:0_post_notify_stonith_0">
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-@@ -42,10 +29,10 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="3">
-+ <synapse id="2">
- <action_set>
- <pseudo_event id="62" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq: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_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" 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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="200000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <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_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" 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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="200000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </pseudo_event>
- </action_set>
- <inputs>
-@@ -57,11 +44,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="4">
-+ <synapse id="3">
- <action_set>
-- <rsc_op id="231" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:1_pre_notify_stop_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1">
-+ <rsc_op id="226" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:1_pre_notify_stop_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1">
- <primitive id="rabbitmq" long-id="rabbitmq:1" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-1" CRM_meta_on_node_uuid="rabbitmq-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-1" CRM_meta_on_node_uuid="rabbitmq-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -70,37 +57,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="5" priority="1000000">
-- <action_set>
-- <rsc_op id="228" operation="notify" operation_key="rabbitmq_post_notify_start_0" internal_operation_key="rabbitmq:1_post_notify_start_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1">
-- <primitive id="rabbitmq" long-id="rabbitmq:1" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-1" CRM_meta_on_node_uuid="rabbitmq-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-- </rsc_op>
-- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="69" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="6">
-- <action_set>
-- <rsc_op id="227" operation="notify" operation_key="rabbitmq_pre_notify_start_0" internal_operation_key="rabbitmq:1_pre_notify_start_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1">
-- <primitive id="rabbitmq" long-id="rabbitmq:1" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-1" CRM_meta_on_node_uuid="rabbitmq-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-- </rsc_op>
-- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="67" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="7" priority="1000000">
-+ <synapse id="4" priority="1000000">
- <action_set>
- <rsc_op id="212" operation="notify" operation_key="rabbitmq_post_notify_stop_0" internal_operation_key="rabbitmq:1_post_notify_stop_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1">
- <primitive id="rabbitmq" long-id="rabbitmq:1" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-1" CRM_meta_on_node_uuid="rabbitmq-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-1" CRM_meta_on_node_uuid="rabbitmq-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -112,11 +73,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="8">
-+ <synapse id="5">
- <action_set>
-- <rsc_op id="232" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:2_pre_notify_stop_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2">
-+ <rsc_op id="227" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:2_pre_notify_stop_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2">
- <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-2" CRM_meta_on_node_uuid="rabbitmq-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-2" CRM_meta_on_node_uuid="rabbitmq-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -125,37 +86,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="9" priority="1000000">
-- <action_set>
-- <rsc_op id="230" operation="notify" operation_key="rabbitmq_post_notify_start_0" internal_operation_key="rabbitmq:2_post_notify_start_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2">
-- <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-2" CRM_meta_on_node_uuid="rabbitmq-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-- </rsc_op>
-- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="69" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="10">
-- <action_set>
-- <rsc_op id="229" operation="notify" operation_key="rabbitmq_pre_notify_start_0" internal_operation_key="rabbitmq:2_pre_notify_start_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2">
-- <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-2" CRM_meta_on_node_uuid="rabbitmq-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-- </rsc_op>
-- </action_set>
-- <inputs>
-- <trigger>
-- <pseudo_event id="67" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="11" priority="1000000">
-+ <synapse id="6" priority="1000000">
- <action_set>
- <rsc_op id="213" operation="notify" operation_key="rabbitmq_post_notify_stop_0" internal_operation_key="rabbitmq:2_post_notify_stop_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2">
- <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-2" CRM_meta_on_node_uuid="rabbitmq-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <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_notify="true" CRM_meta_notify_active_resource="rabbitmq:0 rabbitmq:1 rabbitmq:2" CRM_meta_notify_active_uname="rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-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-2 rabbitmq-bundle-0 rabbitmq-bundle-1 controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="post" CRM_meta_on_node="rabbitmq-bundle-2" CRM_meta_on_node_uuid="rabbitmq-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -167,7 +102,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="12" priority="1000000">
-+ <synapse id="7" priority="1000000">
- <action_set>
- <pseudo_event id="76" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-post_notify_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -185,7 +120,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="13" priority="1000000">
-+ <synapse id="8" priority="1000000">
- <action_set>
- <pseudo_event id="75" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -200,7 +135,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="14">
-+ <synapse id="9">
- <action_set>
- <pseudo_event id="74" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -211,14 +146,14 @@
- <pseudo_event id="73" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="231" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:1_pre_notify_stop_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1"/>
-+ <rsc_op id="226" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:1_pre_notify_stop_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1"/>
- </trigger>
- <trigger>
-- <rsc_op id="232" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:2_pre_notify_stop_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2"/>
-+ <rsc_op id="227" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:2_pre_notify_stop_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="15">
-+ <synapse id="10">
- <action_set>
- <pseudo_event id="73" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -226,7 +161,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="16" priority="1000000">
-+ <synapse id="11" priority="1000000">
- <action_set>
- <pseudo_event id="72" operation="stopped" operation_key="rabbitmq-bundle-clone_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -241,7 +176,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="17">
-+ <synapse id="12">
- <action_set>
- <pseudo_event id="71" operation="stop" operation_key="rabbitmq-bundle-clone_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -259,7 +194,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="18" priority="1000000">
-+ <synapse id="13" priority="1000000">
- <action_set>
- <pseudo_event id="70" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-post_notify_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -269,18 +204,9 @@
- <trigger>
- <pseudo_event id="69" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0"/>
- </trigger>
-- <trigger>
-- <rsc_op id="226" operation="notify" operation_key="rabbitmq_post_notify_start_0" internal_operation_key="rabbitmq:0_post_notify_start_0" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0" router_node="controller-1"/>
-- </trigger>
-- <trigger>
-- <rsc_op id="228" operation="notify" operation_key="rabbitmq_post_notify_start_0" internal_operation_key="rabbitmq:1_post_notify_start_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1"/>
-- </trigger>
-- <trigger>
-- <rsc_op id="230" operation="notify" operation_key="rabbitmq_post_notify_start_0" internal_operation_key="rabbitmq:2_post_notify_start_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2"/>
-- </trigger>
- </inputs>
- </synapse>
-- <synapse id="19" priority="1000000">
-+ <synapse id="14" priority="1000000">
- <action_set>
- <pseudo_event id="69" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -295,7 +221,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="20">
-+ <synapse id="15">
- <action_set>
- <pseudo_event id="68" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -305,15 +231,9 @@
- <trigger>
- <pseudo_event id="67" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0"/>
- </trigger>
-- <trigger>
-- <rsc_op id="227" operation="notify" operation_key="rabbitmq_pre_notify_start_0" internal_operation_key="rabbitmq:1_pre_notify_start_0" on_node="rabbitmq-bundle-1" on_node_uuid="rabbitmq-bundle-1" router_node="controller-1"/>
-- </trigger>
-- <trigger>
-- <rsc_op id="229" operation="notify" operation_key="rabbitmq_pre_notify_start_0" internal_operation_key="rabbitmq:2_pre_notify_start_0" on_node="rabbitmq-bundle-2" on_node_uuid="rabbitmq-bundle-2" router_node="controller-2"/>
-- </trigger>
- </inputs>
- </synapse>
-- <synapse id="21">
-+ <synapse id="16">
- <action_set>
- <pseudo_event id="67" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -325,7 +245,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="22" priority="1000000">
-+ <synapse id="17" priority="1000000">
- <action_set>
- <pseudo_event id="66" operation="running" operation_key="rabbitmq-bundle-clone_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -337,7 +257,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="23">
-+ <synapse id="18">
- <action_set>
- <pseudo_event id="65" operation="start" operation_key="rabbitmq-bundle-clone_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -355,7 +275,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="24">
-+ <synapse id="19">
- <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 -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3122 -v /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/rabbitmq:/var/lib/rabbitmq:rw -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/rabbitmq-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-@@ -373,7 +293,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="25">
-+ <synapse id="20">
- <action_set>
- <pseudo_event id="43" operation="stop" operation_key="rabbitmq-bundle-0_stop_0">
- <attributes CRM_meta_container="rabbitmq-bundle-docker-0" CRM_meta_timeout="20000" addr="controller-0" port="3122"/>
-@@ -381,7 +301,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="26">
-+ <synapse id="21">
- <action_set>
- <rsc_op id="36" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-@@ -390,7 +310,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="27">
-+ <synapse id="22">
- <action_set>
- <rsc_op id="30" operation="monitor" operation_key="rabbitmq-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="rabbitmq-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-@@ -399,7 +319,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="28">
-+ <synapse id="23">
- <action_set>
- <rsc_op id="37" operation="monitor" operation_key="rabbitmq-bundle-1_monitor_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="rabbitmq-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-@@ -408,7 +328,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="29">
-+ <synapse id="24">
- <action_set>
- <rsc_op id="31" operation="monitor" operation_key="rabbitmq-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="rabbitmq-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-@@ -417,7 +337,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="30">
-+ <synapse id="25">
- <action_set>
- <pseudo_event id="102" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0">
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_physical_host="controller-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="controller-0:controller-0.internalapi.localdomain;controller-1:controller-1.internalapi.localdomain;controller-2:controller-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://controller-0.internalapi.localdomain,controller-1.internalapi.localdomain,controller-2.internalapi.localdomain"/>
-@@ -435,7 +355,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="31">
-+ <synapse id="26">
- <action_set>
- <pseudo_event id="101" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0">
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_physical_host="controller-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="controller-0:controller-0.internalapi.localdomain;controller-1:controller-1.internalapi.localdomain;controller-2:controller-2.internalapi.localdomain" enable_creation="true" wsrep_cluster_address="gcomm://controller-0.internalapi.localdomain,controller-1.internalapi.localdomain,controller-2.internalapi.localdomain"/>
-@@ -447,7 +367,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="32" priority="1000000">
-+ <synapse id="27" priority="1000000">
- <action_set>
- <pseudo_event id="113" operation="demoted" operation_key="galera-bundle-master_demoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-@@ -462,7 +382,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="33">
-+ <synapse id="28">
- <action_set>
- <pseudo_event id="112" operation="demote" operation_key="galera-bundle-master_demote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-@@ -474,7 +394,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="34" priority="1000000">
-+ <synapse id="29" priority="1000000">
- <action_set>
- <pseudo_event id="109" operation="stopped" operation_key="galera-bundle-master_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-@@ -489,7 +409,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="35">
-+ <synapse id="30">
- <action_set>
- <pseudo_event id="108" operation="stop" operation_key="galera-bundle-master_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-@@ -507,7 +427,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="36" priority="1000000">
-+ <synapse id="31" priority="1000000">
- <action_set>
- <pseudo_event id="107" operation="running" operation_key="galera-bundle-master_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-@@ -519,7 +439,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="37">
-+ <synapse id="32">
- <action_set>
- <pseudo_event id="106" operation="start" operation_key="galera-bundle-master_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-@@ -537,7 +457,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="38">
-+ <synapse id="33">
- <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 -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-@@ -555,7 +475,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="39">
-+ <synapse id="34">
- <action_set>
- <pseudo_event id="78" operation="stop" operation_key="galera-bundle-0_stop_0">
- <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_timeout="20000" addr="controller-0" port="3123"/>
-@@ -563,7 +483,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="40">
-+ <synapse id="35">
- <action_set>
- <rsc_op id="38" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-@@ -572,7 +492,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="41">
-+ <synapse id="36">
- <action_set>
- <rsc_op id="32" operation="monitor" operation_key="galera-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-@@ -581,7 +501,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="42">
-+ <synapse id="37">
- <action_set>
- <rsc_op id="39" operation="monitor" operation_key="galera-bundle-1_monitor_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="galera-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-@@ -590,7 +510,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="43">
-+ <synapse id="38">
- <action_set>
- <rsc_op id="33" operation="monitor" operation_key="galera-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="galera-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-@@ -599,11 +519,11 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="44" priority="1000000">
-+ <synapse id="39" priority="1000000">
- <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">
-+ <rsc_op id="231" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -612,11 +532,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="45">
-+ <synapse id="40">
- <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">
-+ <rsc_op id="230" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -625,20 +545,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="46" priority="1000000">
-- <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="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>
-- <trigger>
-- <pseudo_event id="149" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="47" priority="1000000">
-+ <synapse id="41" priority="1000000">
- <action_set>
- <pseudo_event id="216" operation="notified" operation_key="redis_notified_0" internal_operation_key="redis:0_confirmed-post_notify_stonith_0">
- <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_key_operation="stonith" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-@@ -656,7 +563,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="48" priority="1000000">
-+ <synapse id="42" priority="1000000">
- <action_set>
- <pseudo_event id="215" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0">
- <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_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" wait_last_known_master="true"/>
-@@ -668,10 +575,10 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="49">
-+ <synapse id="43">
- <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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -686,10 +593,10 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="50">
-+ <synapse id="44">
- <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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -698,11 +605,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="51" priority="1000000">
-+ <synapse id="45" priority="1000000">
- <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">
-+ <rsc_op id="237" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -711,11 +618,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="52">
-+ <synapse id="46">
- <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">
-+ <rsc_op id="236" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -724,11 +631,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="53" priority="1000000">
-+ <synapse id="47" priority="1000000">
- <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">
-+ <rsc_op id="233" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -737,11 +644,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="54">
-+ <synapse id="48">
- <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">
-+ <rsc_op id="232" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -750,11 +657,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="55">
-+ <synapse id="49">
- <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">
-+ <rsc_op id="228" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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,37 +670,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="56" priority="1000000">
-- <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="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>
-- <trigger>
-- <pseudo_event id="149" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="57">
-- <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="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>
-- <trigger>
-- <pseudo_event id="147" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="58" priority="1000000">
-+ <synapse id="50" priority="1000000">
- <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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -805,7 +686,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="59">
-+ <synapse id="51">
- <action_set>
- <rsc_op id="137" operation="monitor" operation_key="redis_monitor_20000" internal_operation_key="redis:1_monitor_20000" 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"/>
-@@ -817,9 +698,6 @@
- <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"/>
- </trigger>
- <trigger>
-- <pseudo_event id="150" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
-- </trigger>
-- <trigger>
- <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_stopped_0"/>
- </trigger>
- <trigger>
-@@ -833,11 +711,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="60">
-+ <synapse id="52">
- <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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -855,7 +733,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="61">
-+ <synapse id="53">
- <action_set>
- <rsc_op id="28" operation="cancel" operation_key="redis_monitor_45000" internal_operation_key="redis:1_monitor_45000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-@@ -864,7 +742,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="62">
-+ <synapse id="54">
- <action_set>
- <rsc_op id="27" operation="cancel" operation_key="redis_monitor_60000" internal_operation_key="redis:1_monitor_60000" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
-@@ -873,11 +751,11 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="63" priority="1000000">
-+ <synapse id="55" priority="1000000">
- <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">
-+ <rsc_op id="239" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -886,11 +764,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="64">
-+ <synapse id="56">
- <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">
-+ <rsc_op id="238" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -899,11 +777,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="65" priority="1000000">
-+ <synapse id="57" priority="1000000">
- <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">
-+ <rsc_op id="235" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -912,11 +790,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="66">
-+ <synapse id="58">
- <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">
-+ <rsc_op id="234" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -925,11 +803,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="67">
-+ <synapse id="59">
- <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">
-+ <rsc_op id="229" 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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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,37 +816,11 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="68" priority="1000000">
-- <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="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>
-- <trigger>
-- <pseudo_event id="149" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="69">
-- <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="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>
-- <trigger>
-- <pseudo_event id="147" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
-- </trigger>
-- </inputs>
-- </synapse>
-- <synapse id="70" priority="1000000">
-+ <synapse id="60" priority="1000000">
- <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="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"/>
-+ <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=" " CRM_meta_notify_start_uname=" " 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>
-@@ -980,7 +832,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="71" priority="1000000">
-+ <synapse id="61" priority="1000000">
- <action_set>
- <pseudo_event id="168" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_demoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -991,14 +843,14 @@
- <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="237" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="239" 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"/>
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="72" priority="1000000">
-+ <synapse id="62" priority="1000000">
- <action_set>
- <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_post_notify_demoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1013,7 +865,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="73">
-+ <synapse id="63">
- <action_set>
- <pseudo_event id="166" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_demote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1024,14 +876,14 @@
- <pseudo_event id="165" operation="notify" operation_key="redis-bundle-master_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="236" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="238" 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"/>
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="74">
-+ <synapse id="64">
- <action_set>
- <pseudo_event id="165" operation="notify" operation_key="redis-bundle-master_pre_notify_demote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1039,7 +891,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="75" priority="1000000">
-+ <synapse id="65" priority="1000000">
- <action_set>
- <pseudo_event id="164" operation="demoted" operation_key="redis-bundle-master_demoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1054,7 +906,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="76">
-+ <synapse id="66">
- <action_set>
- <pseudo_event id="163" operation="demote" operation_key="redis-bundle-master_demote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1069,7 +921,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="77" priority="1000000">
-+ <synapse id="67" priority="1000000">
- <action_set>
- <pseudo_event id="162" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_promoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1080,17 +932,17 @@
- <pseudo_event id="161" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="231" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="233" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="235" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="78" priority="1000000">
-+ <synapse id="68" priority="1000000">
- <action_set>
- <pseudo_event id="161" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1105,7 +957,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="79">
-+ <synapse id="69">
- <action_set>
- <pseudo_event id="160" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_promote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1116,17 +968,17 @@
- <pseudo_event id="159" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="230" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="232" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="234" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="80">
-+ <synapse id="70">
- <action_set>
- <pseudo_event id="159" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1144,7 +996,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="81" priority="1000000">
-+ <synapse id="71" priority="1000000">
- <action_set>
- <pseudo_event id="158" operation="promoted" operation_key="redis-bundle-master_promoted_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1156,7 +1008,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="82">
-+ <synapse id="72">
- <action_set>
- <pseudo_event id="157" operation="promote" operation_key="redis-bundle-master_promote_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1180,7 +1032,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="83" priority="1000000">
-+ <synapse id="73" priority="1000000">
- <action_set>
- <pseudo_event id="156" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1198,7 +1050,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="84" priority="1000000">
-+ <synapse id="74" priority="1000000">
- <action_set>
- <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_post_notify_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1213,7 +1065,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="85">
-+ <synapse id="75">
- <action_set>
- <pseudo_event id="154" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1224,14 +1076,14 @@
- <pseudo_event id="153" operation="notify" operation_key="redis-bundle-master_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="228" 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"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="229" 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"/>
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="86">
-+ <synapse id="76">
- <action_set>
- <pseudo_event id="153" operation="notify" operation_key="redis-bundle-master_pre_notify_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1243,7 +1095,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="87" priority="1000000">
-+ <synapse id="77" priority="1000000">
- <action_set>
- <pseudo_event id="152" operation="stopped" operation_key="redis-bundle-master_stopped_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1258,7 +1110,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="88">
-+ <synapse id="78">
- <action_set>
- <pseudo_event id="151" operation="stop" operation_key="redis-bundle-master_stop_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1279,7 +1131,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="89" priority="1000000">
-+ <synapse id="79" priority="1000000">
- <action_set>
- <pseudo_event id="150" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1289,18 +1141,9 @@
- <trigger>
- <pseudo_event id="149" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
- </trigger>
-- <trigger>
-- <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"/>
-- </trigger>
-- <trigger>
-- <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"/>
-- </trigger>
-- <trigger>
-- <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"/>
-- </trigger>
- </inputs>
- </synapse>
-- <synapse id="90" priority="1000000">
-+ <synapse id="80" priority="1000000">
- <action_set>
- <pseudo_event id="149" operation="notify" operation_key="redis-bundle-master_post_notify_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
-@@ -1315,7 +1158,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="91">
-+ <synapse id="81">
- <action_set>
- <pseudo_event id="148" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1325,15 +1168,9 @@
- <trigger>
- <pseudo_event id="147" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
- </trigger>
-- <trigger>
-- <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"/>
-- </trigger>
-- <trigger>
-- <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"/>
-- </trigger>
- </inputs>
- </synapse>
-- <synapse id="92">
-+ <synapse id="82">
- <action_set>
- <pseudo_event id="147" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
-@@ -1348,7 +1185,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="93" priority="1000000">
-+ <synapse id="83" priority="1000000">
- <action_set>
- <pseudo_event id="146" operation="running" operation_key="redis-bundle-master_running_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1360,7 +1197,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="94">
-+ <synapse id="84">
- <action_set>
- <pseudo_event id="145" operation="start" operation_key="redis-bundle-master_start_0">
- <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
-@@ -1381,7 +1218,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="95">
-+ <synapse id="85">
- <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 -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3124 -v /var/lib/kolla/config_files/redis.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/redis:/var/lib/redis:rw -v /var/log/redis:/var/log/redis:rw -v /var/run/redis:/var/run/redis:rw -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/redis-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-@@ -1399,7 +1236,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="96">
-+ <synapse id="86">
- <action_set>
- <pseudo_event id="119" operation="stop" operation_key="redis-bundle-0_stop_0">
- <attributes CRM_meta_container="redis-bundle-docker-0" CRM_meta_timeout="20000" addr="controller-0" port="3124"/>
-@@ -1407,7 +1244,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="97">
-+ <synapse id="87">
- <action_set>
- <rsc_op id="40" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-@@ -1416,7 +1253,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="98">
-+ <synapse id="88">
- <action_set>
- <rsc_op id="34" operation="monitor" operation_key="redis-bundle-0_monitor_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="redis-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
-@@ -1425,7 +1262,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="99">
-+ <synapse id="89">
- <action_set>
- <rsc_op id="41" operation="monitor" operation_key="redis-bundle-1_monitor_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis-bundle-1" class="ocf" provider="pacemaker" type="remote"/>
-@@ -1434,7 +1271,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="100">
-+ <synapse id="90">
- <action_set>
- <rsc_op id="35" operation="monitor" operation_key="redis-bundle-2_monitor_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="redis-bundle-2" class="ocf" provider="pacemaker" type="remote"/>
-@@ -1443,7 +1280,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="101">
-+ <synapse id="91">
- <action_set>
- <rsc_op id="175" operation="monitor" operation_key="ip-192.168.24.7_monitor_10000" on_node="controller-2" on_node_uuid="3">
- <primitive id="ip-192.168.24.7" class="ocf" provider="heartbeat" type="IPaddr2"/>
-@@ -1456,7 +1293,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="102">
-+ <synapse id="92">
- <action_set>
- <rsc_op id="174" operation="start" operation_key="ip-192.168.24.7_start_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="ip-192.168.24.7" class="ocf" provider="heartbeat" type="IPaddr2"/>
-@@ -1472,7 +1309,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="103">
-+ <synapse id="93">
- <action_set>
- <pseudo_event id="173" operation="stop" operation_key="ip-192.168.24.7_stop_0">
- <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" cidr_netmask="32" ip="192.168.24.7"/>
-@@ -1487,7 +1324,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="104">
-+ <synapse id="94">
- <action_set>
- <rsc_op id="178" operation="monitor" operation_key="ip-10.0.0.109_monitor_10000" on_node="controller-1" on_node_uuid="2">
- <primitive id="ip-10.0.0.109" class="ocf" provider="heartbeat" type="IPaddr2"/>
-@@ -1500,7 +1337,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="105">
-+ <synapse id="95">
- <action_set>
- <rsc_op id="177" operation="start" operation_key="ip-10.0.0.109_start_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="ip-10.0.0.109" class="ocf" provider="heartbeat" type="IPaddr2"/>
-@@ -1516,7 +1353,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="106">
-+ <synapse id="96">
- <action_set>
- <pseudo_event id="176" operation="stop" operation_key="ip-10.0.0.109_stop_0">
- <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" cidr_netmask="32" ip="10.0.0.109"/>
-@@ -1531,7 +1368,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="107">
-+ <synapse id="97">
- <action_set>
- <rsc_op id="187" operation="monitor" operation_key="ip-172.17.4.11_monitor_10000" on_node="controller-1" on_node_uuid="2">
- <primitive id="ip-172.17.4.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
-@@ -1544,7 +1381,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="108">
-+ <synapse id="98">
- <action_set>
- <rsc_op id="186" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="ip-172.17.4.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
-@@ -1560,7 +1397,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="109">
-+ <synapse id="99">
- <action_set>
- <pseudo_event id="185" operation="stop" operation_key="ip-172.17.4.11_stop_0">
- <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" cidr_netmask="32" ip="172.17.4.11"/>
-@@ -1575,7 +1412,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="110">
-+ <synapse id="100">
- <action_set>
- <pseudo_event id="188" operation="stop" operation_key="haproxy-bundle-docker-0_stop_0">
- <attributes CRM_meta_timeout="20000" allow_pull="true" force_kill="false" image="192.168.24.1:8787/rhosp12/openstack-haproxy-docker:pcmklatest" monitor_cmd="/bin/true" mount_points="" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3121 -v /var/lib/kolla/config_files/haproxy.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro -v /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro -v /dev/log:/dev/log:rw --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
-@@ -1590,7 +1427,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="111">
-+ <synapse id="101">
- <action_set>
- <rsc_op id="203" operation="monitor" operation_key="stonith-fence_ipmilan-5254003e8e97_monitor_60000" on_node="controller-1" on_node_uuid="2">
- <primitive id="stonith-fence_ipmilan-5254003e8e97" class="stonith" type="fence_ipmilan"/>
-@@ -1603,7 +1440,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="112">
-+ <synapse id="102">
- <action_set>
- <rsc_op id="202" operation="start" operation_key="stonith-fence_ipmilan-5254003e8e97_start_0" on_node="controller-1" on_node_uuid="2">
- <primitive id="stonith-fence_ipmilan-5254003e8e97" class="stonith" type="fence_ipmilan"/>
-@@ -1616,7 +1453,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="113">
-+ <synapse id="103">
- <action_set>
- <pseudo_event id="201" operation="stop" operation_key="stonith-fence_ipmilan-5254003e8e97_stop_0">
- <attributes CRM_meta_timeout="20000" action="reboot" ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-2" privlvl="administrator"/>
-@@ -1624,7 +1461,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="114">
-+ <synapse id="104">
- <action_set>
- <rsc_op id="206" operation="monitor" operation_key="stonith-fence_ipmilan-5254000dcb3f_monitor_60000" on_node="controller-2" on_node_uuid="3">
- <primitive id="stonith-fence_ipmilan-5254000dcb3f" class="stonith" type="fence_ipmilan"/>
-@@ -1637,7 +1474,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="115">
-+ <synapse id="105">
- <action_set>
- <rsc_op id="205" operation="start" operation_key="stonith-fence_ipmilan-5254000dcb3f_start_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="stonith-fence_ipmilan-5254000dcb3f" class="stonith" type="fence_ipmilan"/>
-@@ -1650,7 +1487,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="116">
-+ <synapse id="106">
- <action_set>
- <pseudo_event id="204" operation="stop" operation_key="stonith-fence_ipmilan-5254000dcb3f_stop_0">
- <attributes CRM_meta_timeout="20000" action="reboot" ipaddr="172.16.0.1" ipport="6230" lanplus="true" login="admin" passwd="password" pcmk_host_list="controller-1" privlvl="administrator"/>
-@@ -1658,7 +1495,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="117">
-+ <synapse id="107">
- <action_set>
- <pseudo_event id="214" operation="stonith" operation_key="stonith-redis-bundle-0-off" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0">
- <attributes CRM_meta_master_redis="1" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_stonith_action="off" />
-@@ -1673,7 +1510,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="118">
-+ <synapse id="108">
- <action_set>
- <pseudo_event id="209" operation="stonith" operation_key="stonith-rabbitmq-bundle-0-off" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0">
- <attributes CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_rmq_node_attr_last_known_rabbitmq="rabbit@controller-0" CRM_meta_stonith_action="off" />
-@@ -1688,7 +1525,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="119">
-+ <synapse id="109">
- <action_set>
- <pseudo_event id="208" operation="stonith" operation_key="stonith-galera-bundle-0-off" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0">
- <attributes CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_stonith_action="off" />
-@@ -1703,7 +1540,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="120">
-+ <synapse id="110">
- <action_set>
- <pseudo_event id="207" operation="stonith_complete" operation_key="stonith_complete">
- <attributes />
-@@ -1724,7 +1561,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="121" priority="1000000">
-+ <synapse id="111" priority="1000000">
- <action_set>
- <pseudo_event id="196" operation="stopped" operation_key="haproxy-bundle_stopped_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1736,7 +1573,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="122">
-+ <synapse id="112">
- <action_set>
- <pseudo_event id="195" operation="stop" operation_key="haproxy-bundle_stop_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1744,7 +1581,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="123" priority="1000000">
-+ <synapse id="113" priority="1000000">
- <action_set>
- <pseudo_event id="172" operation="demoted" operation_key="redis-bundle_demoted_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1759,7 +1596,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="124">
-+ <synapse id="114">
- <action_set>
- <pseudo_event id="171" operation="demote" operation_key="redis-bundle_demote_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1767,7 +1604,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="125" priority="1000000">
-+ <synapse id="115" priority="1000000">
- <action_set>
- <pseudo_event id="170" operation="promoted" operation_key="redis-bundle_promoted_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1779,7 +1616,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="126">
-+ <synapse id="116">
- <action_set>
- <pseudo_event id="169" operation="promote" operation_key="redis-bundle_promote_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1797,7 +1634,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="127" priority="1000000">
-+ <synapse id="117" priority="1000000">
- <action_set>
- <pseudo_event id="133" operation="stopped" operation_key="redis-bundle_stopped_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1812,7 +1649,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="128">
-+ <synapse id="118">
- <action_set>
- <pseudo_event id="132" operation="stop" operation_key="redis-bundle_stop_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1824,7 +1661,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="129" priority="1000000">
-+ <synapse id="119" priority="1000000">
- <action_set>
- <pseudo_event id="131" operation="running" operation_key="redis-bundle_running_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1836,7 +1673,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="130">
-+ <synapse id="120">
- <action_set>
- <pseudo_event id="130" operation="start" operation_key="redis-bundle_start_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1851,7 +1688,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="131" priority="1000000">
-+ <synapse id="121" priority="1000000">
- <action_set>
- <pseudo_event id="117" operation="demoted" operation_key="galera-bundle_demoted_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1866,7 +1703,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="132">
-+ <synapse id="122">
- <action_set>
- <pseudo_event id="116" operation="demote" operation_key="galera-bundle_demote_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1874,7 +1711,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="133" priority="1000000">
-+ <synapse id="123" priority="1000000">
- <action_set>
- <pseudo_event id="92" operation="stopped" operation_key="galera-bundle_stopped_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1889,7 +1726,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="134">
-+ <synapse id="124">
- <action_set>
- <pseudo_event id="91" operation="stop" operation_key="galera-bundle_stop_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1901,7 +1738,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="135" priority="1000000">
-+ <synapse id="125" priority="1000000">
- <action_set>
- <pseudo_event id="90" operation="running" operation_key="galera-bundle_running_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1913,7 +1750,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="136">
-+ <synapse id="126">
- <action_set>
- <pseudo_event id="89" operation="start" operation_key="galera-bundle_start_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1928,7 +1765,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="137" priority="1000000">
-+ <synapse id="127" priority="1000000">
- <action_set>
- <pseudo_event id="57" operation="stopped" operation_key="rabbitmq-bundle_stopped_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1943,7 +1780,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="138">
-+ <synapse id="128">
- <action_set>
- <pseudo_event id="56" operation="stop" operation_key="rabbitmq-bundle_stop_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1951,7 +1788,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="139" priority="1000000">
-+ <synapse id="129" priority="1000000">
- <action_set>
- <pseudo_event id="55" operation="running" operation_key="rabbitmq-bundle_running_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1963,7 +1800,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="140">
-+ <synapse id="130">
- <action_set>
- <pseudo_event id="54" operation="start" operation_key="rabbitmq-bundle_start_0">
- <attributes CRM_meta_timeout="20000" />
-@@ -1971,7 +1808,7 @@
- </action_set>
- <inputs/>
- </synapse>
-- <synapse id="141">
-+ <synapse id="131">
- <action_set>
- <pseudo_event id="29" operation="all_stopped" operation_key="all_stopped">
- <attributes />
-@@ -2040,7 +1877,7 @@
- </trigger>
- </inputs>
- </synapse>
-- <synapse id="142">
-+ <synapse id="132">
- <action_set>
- <crm_event id="1" operation="stonith" operation_key="stonith-controller-0-reboot" on_node="controller-0" on_node_uuid="1">
- <attributes CRM_meta_cinder_volume_role="true" CRM_meta_galera_role="true" CRM_meta_haproxy_role="true" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_rabbitmq_role="true" CRM_meta_redis_role="true" CRM_meta_rmq_node_attr_last_known_rabbitmq="rabbit@controller-0" CRM_meta_stonith_action="reboot" />
-diff --git a/pengine/test10/bundle-order-fencing.summary b/pengine/test10/bundle-order-fencing.summary
-index 0457f83..d398a12 100644
---- a/pengine/test10/bundle-order-fencing.summary
-+++ b/pengine/test10/bundle-order-fencing.summary
-@@ -147,8 +147,6 @@ Executing cluster transition:
- * Pseudo action: redis-bundle-docker-0_stop_0
- * Pseudo action: rabbitmq-bundle_stopped_0
- * Pseudo action: rabbitmq_notified_0
-- * Resource action: rabbitmq notify on rabbitmq-bundle-1
-- * Resource action: rabbitmq notify on rabbitmq-bundle-2
- * Pseudo action: rabbitmq-bundle-clone_confirmed-pre_notify_start_0
- * Pseudo action: rabbitmq-bundle-clone_start_0
- * Pseudo action: galera-bundle-master_running_0
-@@ -164,22 +162,14 @@ Executing cluster transition:
- * Pseudo action: redis-bundle-master_pre_notify_start_0
- * Pseudo action: redis-bundle_stopped_0
- * Pseudo action: redis-bundle_start_0
-- * Resource action: rabbitmq notify on rabbitmq-bundle-0
-- * Resource action: rabbitmq notify on rabbitmq-bundle-1
-- * Resource action: rabbitmq notify on rabbitmq-bundle-2
- * Pseudo action: rabbitmq-bundle-clone_confirmed-post_notify_running_0
- * Pseudo action: redis_notified_0
-- * Resource action: redis notify on redis-bundle-1
-- * Resource action: redis notify on redis-bundle-2
- * Pseudo action: redis-bundle-master_confirmed-pre_notify_start_0
- * Pseudo action: redis-bundle-master_start_0
- * Pseudo action: rabbitmq-bundle_running_0
- * Pseudo action: all_stopped
- * Pseudo action: redis-bundle-master_running_0
- * Pseudo action: redis-bundle-master_post_notify_running_0
-- * Resource action: redis notify on redis-bundle-0
-- * Resource action: redis notify on redis-bundle-1
-- * Resource action: redis notify on redis-bundle-2
- * Pseudo action: redis-bundle-master_confirmed-post_notify_running_0
- * Pseudo action: redis-bundle_running_0
- * Pseudo action: redis-bundle-master_pre_notify_promote_0
-diff --git a/pengine/test10/bundle-order-partial-start-2.exp b/pengine/test10/bundle-order-partial-start-2.exp
-index afba801..bf9a0b0 100644
---- a/pengine/test10/bundle-order-partial-start-2.exp
-+++ b/pengine/test10/bundle-order-partial-start-2.exp
-@@ -315,7 +315,7 @@
- </synapse>
- <synapse id="22" priority="1000000">
- <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">
-+ <rsc_op id="134" 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 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>
-@@ -328,7 +328,7 @@
- </synapse>
- <synapse id="23">
- <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">
-+ <rsc_op id="133" 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 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>
-@@ -379,7 +379,7 @@
- <pseudo_event id="91" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="134" 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"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -409,7 +409,7 @@
- <pseudo_event id="89" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="133" 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"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bundle-order-partial-start.exp b/pengine/test10/bundle-order-partial-start.exp
-index cb10bad..8e28f19 100644
---- a/pengine/test10/bundle-order-partial-start.exp
-+++ b/pengine/test10/bundle-order-partial-start.exp
-@@ -296,7 +296,7 @@
- </synapse>
- <synapse id="21" priority="1000000">
- <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">
-+ <rsc_op id="133" 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 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>
-@@ -309,7 +309,7 @@
- </synapse>
- <synapse id="22">
- <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">
-+ <rsc_op id="132" 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 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>
-@@ -360,7 +360,7 @@
- <pseudo_event id="90" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="133" 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"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -390,7 +390,7 @@
- <pseudo_event id="88" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <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"/>
-+ <rsc_op id="132" 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"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bundle-order-partial-stop.dot b/pengine/test10/bundle-order-partial-stop.dot
-index 5d0c039..6bad4ab 100644
---- a/pengine/test10/bundle-order-partial-stop.dot
-+++ b/pengine/test10/bundle-order-partial-stop.dot
-@@ -112,7 +112,6 @@ digraph "g" {
- "rabbitmq-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold]
- "rabbitmq-bundle-0_stop_0 undercloud" -> "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style = bold]
- "rabbitmq-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"]
--"rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed]
- "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
- "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = dashed]
-@@ -178,8 +177,6 @@ digraph "g" {
- "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
- "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = dashed]
-diff --git a/pengine/test10/bundle-order-partial-stop.exp b/pengine/test10/bundle-order-partial-stop.exp
-index 6119950..89d87aa 100644
---- a/pengine/test10/bundle-order-partial-stop.exp
-+++ b/pengine/test10/bundle-order-partial-stop.exp
-@@ -3,7 +3,7 @@
- <action_set>
- <rsc_op id="135" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:0_pre_notify_stop_0" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0" router_node="undercloud">
- <primitive id="rabbitmq" long-id="rabbitmq:0" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -16,7 +16,7 @@
- <action_set>
- <rsc_op id="25" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:0_stop_0" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0" router_node="undercloud">
- <primitive id="rabbitmq" long-id="rabbitmq:0" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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-startup-clone.dot b/pengine/test10/bundle-order-startup-clone.dot
-index 8426bd2..a23a2fe 100644
---- a/pengine/test10/bundle-order-startup-clone.dot
-+++ b/pengine/test10/bundle-order-startup-clone.dot
-@@ -118,9 +118,6 @@ digraph "g" {
- "redis:0_start_0 redis-bundle-0" -> "redis:0_monitor_60000 redis-bundle-0" [ style = bold]
- "redis:0_start_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"]
- "storage-clone_confirmed-post_notify_running_0" -> "galera-bundle_start_0" [ style = dashed]
--"storage-clone_confirmed-post_notify_running_0" -> "storage:0_monitor_30000 metal-1" [ style = dashed]
--"storage-clone_confirmed-post_notify_running_0" -> "storage:1_monitor_30000 metal-2" [ style = dashed]
--"storage-clone_confirmed-post_notify_running_0" -> "storage:2_monitor_30000 metal-3" [ style = dashed]
- "storage-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "storage-clone_confirmed-pre_notify_start_0" -> "storage-clone_post_notify_running_0" [ style = dashed]
- "storage-clone_confirmed-pre_notify_start_0" -> "storage-clone_start_0" [ style = dashed]
-diff --git a/pengine/test10/bundle-order-stop-clone.exp b/pengine/test10/bundle-order-stop-clone.exp
-index 3e3fe77..3e66f54 100644
---- a/pengine/test10/bundle-order-stop-clone.exp
-+++ b/pengine/test10/bundle-order-stop-clone.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0">
- <action_set>
-- <rsc_op id="168" operation="notify" operation_key="storage:0_pre_notify_stop_0" on_node="metal-1" on_node_uuid="1">
-+ <rsc_op id="164" operation="notify" operation_key="storage:0_pre_notify_stop_0" on_node="metal-1" on_node_uuid="1">
- <primitive id="storage" long-id="storage:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="storage:0 storage:1 storage:2" CRM_meta_notify_active_uname="metal-1 metal-2 metal-3" 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="metal-2 metal-3 rabbitmq-bundle-0 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="storage:3" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="storage:0" CRM_meta_notify_stop_uname="metal-1" CRM_meta_notify_type="pre" CRM_meta_on_node="metal-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" device="nfs:/share/drbd_www/data/" directory="/data/www" fstype="nfs"/>
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="170" operation="notify" operation_key="storage:1_post_notify_stop_0" on_node="metal-2" on_node_uuid="2">
-+ <rsc_op id="166" operation="notify" operation_key="storage:1_post_notify_stop_0" on_node="metal-2" on_node_uuid="2">
- <primitive id="storage" long-id="storage:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="storage:0 storage:1 storage:2" CRM_meta_notify_active_uname="metal-1 metal-2 metal-3" 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="metal-2 metal-3 rabbitmq-bundle-0 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="storage:3" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="storage:0" CRM_meta_notify_stop_uname="metal-1" CRM_meta_notify_type="post" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" device="nfs:/share/drbd_www/data/" directory="/data/www" fstype="nfs"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="169" operation="notify" operation_key="storage:1_pre_notify_stop_0" on_node="metal-2" on_node_uuid="2">
-+ <rsc_op id="165" operation="notify" operation_key="storage:1_pre_notify_stop_0" on_node="metal-2" on_node_uuid="2">
- <primitive id="storage" long-id="storage:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="storage:0 storage:1 storage:2" CRM_meta_notify_active_uname="metal-1 metal-2 metal-3" 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="metal-2 metal-3 rabbitmq-bundle-0 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="storage:3" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="storage:0" CRM_meta_notify_stop_uname="metal-1" CRM_meta_notify_type="pre" CRM_meta_on_node="metal-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" device="nfs:/share/drbd_www/data/" directory="/data/www" fstype="nfs"/>
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4" priority="1000000">
- <action_set>
-- <rsc_op id="172" operation="notify" operation_key="storage:2_post_notify_stop_0" on_node="metal-3" on_node_uuid="3">
-+ <rsc_op id="168" operation="notify" operation_key="storage:2_post_notify_stop_0" on_node="metal-3" on_node_uuid="3">
- <primitive id="storage" long-id="storage:2" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="storage:0 storage:1 storage:2" CRM_meta_notify_active_uname="metal-1 metal-2 metal-3" 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="metal-2 metal-3 rabbitmq-bundle-0 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="storage:3" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="storage:0" CRM_meta_notify_stop_uname="metal-1" CRM_meta_notify_type="post" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" device="nfs:/share/drbd_www/data/" directory="/data/www" fstype="nfs"/>
- </rsc_op>
-@@ -66,7 +66,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="171" operation="notify" operation_key="storage:2_pre_notify_stop_0" on_node="metal-3" on_node_uuid="3">
-+ <rsc_op id="167" operation="notify" operation_key="storage:2_pre_notify_stop_0" on_node="metal-3" on_node_uuid="3">
- <primitive id="storage" long-id="storage:2" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="storage:0 storage:1 storage:2" CRM_meta_notify_active_uname="metal-1 metal-2 metal-3" 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="metal-2 metal-3 rabbitmq-bundle-0 metal-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="storage:3" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="storage:0" CRM_meta_notify_stop_uname="metal-1" CRM_meta_notify_type="pre" CRM_meta_on_node="metal-3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" device="nfs:/share/drbd_www/data/" directory="/data/www" fstype="nfs"/>
- </rsc_op>
-@@ -88,10 +88,10 @@
- <pseudo_event id="56" operation="notify" operation_key="storage-clone_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="170" operation="notify" operation_key="storage:1_post_notify_stop_0" on_node="metal-2" on_node_uuid="2"/>
-+ <rsc_op id="166" operation="notify" operation_key="storage:1_post_notify_stop_0" on_node="metal-2" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <rsc_op id="172" operation="notify" operation_key="storage:2_post_notify_stop_0" on_node="metal-3" on_node_uuid="3"/>
-+ <rsc_op id="168" operation="notify" operation_key="storage:2_post_notify_stop_0" on_node="metal-3" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -121,13 +121,13 @@
- <pseudo_event id="54" operation="notify" operation_key="storage-clone_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="168" operation="notify" operation_key="storage:0_pre_notify_stop_0" on_node="metal-1" on_node_uuid="1"/>
-+ <rsc_op id="164" operation="notify" operation_key="storage:0_pre_notify_stop_0" on_node="metal-1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="169" operation="notify" operation_key="storage:1_pre_notify_stop_0" on_node="metal-2" on_node_uuid="2"/>
-+ <rsc_op id="165" operation="notify" operation_key="storage:1_pre_notify_stop_0" on_node="metal-2" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <rsc_op id="171" operation="notify" operation_key="storage:2_pre_notify_stop_0" on_node="metal-3" on_node_uuid="3"/>
-+ <rsc_op id="167" operation="notify" operation_key="storage:2_pre_notify_stop_0" on_node="metal-3" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bundle-order-stop-on-remote.exp b/pengine/test10/bundle-order-stop-on-remote.exp
-index db5386b..96588dc 100644
---- a/pengine/test10/bundle-order-stop-on-remote.exp
-+++ b/pengine/test10/bundle-order-stop-on-remote.exp
-@@ -588,7 +588,7 @@
- </synapse>
- <synapse id="34" priority="1000000">
- <action_set>
-- <rsc_op id="251" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <rsc_op id="245" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
- <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -601,7 +601,7 @@
- </synapse>
- <synapse id="35">
- <action_set>
-- <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
- <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -614,7 +614,7 @@
- </synapse>
- <synapse id="36" priority="1000000">
- <action_set>
-- <rsc_op id="242" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <rsc_op id="236" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
- <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -627,7 +627,7 @@
- </synapse>
- <synapse id="37">
- <action_set>
-- <rsc_op id="241" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
-+ <rsc_op id="235" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0">
- <primitive id="redis" long-id="redis:0" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-0" CRM_meta_on_node_uuid="redis-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -675,7 +675,7 @@
- </synapse>
- <synapse id="40" priority="1000000">
- <action_set>
-- <rsc_op id="253" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <rsc_op id="247" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -688,7 +688,7 @@
- </synapse>
- <synapse id="41">
- <action_set>
-- <rsc_op id="252" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <rsc_op id="246" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -701,7 +701,7 @@
- </synapse>
- <synapse id="42" priority="1000000">
- <action_set>
-- <rsc_op id="243" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
-+ <rsc_op id="237" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-1" CRM_meta_on_node_uuid="redis-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -780,7 +780,7 @@
- </synapse>
- <synapse id="46" priority="1000000">
- <action_set>
-- <rsc_op id="255" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <rsc_op id="249" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -793,7 +793,7 @@
- </synapse>
- <synapse id="47">
- <action_set>
-- <rsc_op id="254" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <rsc_op id="248" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -806,7 +806,7 @@
- </synapse>
- <synapse id="48" priority="1000000">
- <action_set>
-- <rsc_op id="245" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <rsc_op id="239" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -819,7 +819,7 @@
- </synapse>
- <synapse id="49">
- <action_set>
-- <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
-+ <rsc_op id="238" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:2" CRM_meta_notify_active_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 database-0 database-1 database-2 database-0 database-1 database-2 messaging-0 messaging-1 messaging-2 messaging-0 messaging-1 messaging-2 controller-0 redis-bundle-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 database-0 database-1 database-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 messaging-0 messaging-1 messaging-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="database-1 database-0 controller-2 controller-1 controller-0 redis-bundle-2 redis-bundle-1 redis-bundle-0 messaging-2 messaging-1 messaging-0 database-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="redis:0" CRM_meta_notify_promote_uname="redis-bundle-0" CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="redis-bundle-0 redis-bundle-2" CRM_meta_notify_start_resource="redis:1" CRM_meta_notify_start_uname="redis-bundle-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redis-bundle-2" CRM_meta_on_node_uuid="redis-bundle-2" CRM_meta_physical_host="controller-2" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -841,13 +841,13 @@
- <pseudo_event id="169" operation="notify" operation_key="redis-bundle-master_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="251" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ <rsc_op id="245" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:0_post_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
- </trigger>
- <trigger>
-- <rsc_op id="253" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ <rsc_op id="247" operation="notify" operation_key="redis:1_post_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
- </trigger>
- <trigger>
-- <rsc_op id="255" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ <rsc_op id="249" operation="notify" operation_key="redis_post_notify_promote_0" internal_operation_key="redis:2_post_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -877,13 +877,13 @@
- <pseudo_event id="167" operation="notify" operation_key="redis-bundle-master_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="250" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:0_pre_notify_promote_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
- </trigger>
- <trigger>
-- <rsc_op id="252" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ <rsc_op id="246" operation="notify" operation_key="redis:1_pre_notify_promote_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
- </trigger>
- <trigger>
-- <rsc_op id="254" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ <rsc_op id="248" operation="notify" operation_key="redis_pre_notify_promote_0" internal_operation_key="redis:2_pre_notify_promote_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -940,13 +940,13 @@
- <pseudo_event id="157" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="242" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ <rsc_op id="236" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:0_post_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
- </trigger>
- <trigger>
-- <rsc_op id="243" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
-+ <rsc_op id="237" operation="notify" operation_key="redis:1_post_notify_start_0" on_node="redis-bundle-1" on_node_uuid="redis-bundle-1" router_node="controller-1"/>
- </trigger>
- <trigger>
-- <rsc_op id="245" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ <rsc_op id="239" operation="notify" operation_key="redis_post_notify_start_0" internal_operation_key="redis:2_post_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -976,10 +976,10 @@
- <pseudo_event id="155" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="241" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
-+ <rsc_op id="235" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:0_pre_notify_start_0" on_node="redis-bundle-0" on_node_uuid="redis-bundle-0" router_node="controller-0"/>
- </trigger>
- <trigger>
-- <rsc_op id="244" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
-+ <rsc_op id="238" operation="notify" operation_key="redis_pre_notify_start_0" internal_operation_key="redis:2_pre_notify_start_0" on_node="redis-bundle-2" on_node_uuid="redis-bundle-2" router_node="controller-2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/bundle-order-stop.dot b/pengine/test10/bundle-order-stop.dot
-index 5d0c039..6bad4ab 100644
---- a/pengine/test10/bundle-order-stop.dot
-+++ b/pengine/test10/bundle-order-stop.dot
-@@ -112,7 +112,6 @@ digraph "g" {
- "rabbitmq-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold]
- "rabbitmq-bundle-0_stop_0 undercloud" -> "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style = bold]
- "rabbitmq-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"]
--"rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed]
- "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
- "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = dashed]
-@@ -178,8 +177,6 @@ digraph "g" {
- "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed]
--"redis-bundle-master_confirmed-post_notify_running_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed]
- "redis-bundle-master_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
- "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = dashed]
-diff --git a/pengine/test10/bundle-order-stop.exp b/pengine/test10/bundle-order-stop.exp
-index 6119950..89d87aa 100644
---- a/pengine/test10/bundle-order-stop.exp
-+++ b/pengine/test10/bundle-order-stop.exp
-@@ -3,7 +3,7 @@
- <action_set>
- <rsc_op id="135" operation="notify" operation_key="rabbitmq_pre_notify_stop_0" internal_operation_key="rabbitmq:0_pre_notify_stop_0" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0" router_node="undercloud">
- <primitive id="rabbitmq" long-id="rabbitmq:0" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="rabbitmq-bundle-0 undercloud" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_notify_type="pre" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="20000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -16,7 +16,7 @@
- <action_set>
- <rsc_op id="25" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:0_stop_0" on_node="rabbitmq-bundle-0" on_node_uuid="rabbitmq-bundle-0" router_node="undercloud">
- <primitive id="rabbitmq" long-id="rabbitmq:0" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-- <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="rabbitmq:0" CRM_meta_notify_start_uname="rabbitmq-bundle-0" CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
-+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="rabbitmq:0" CRM_meta_notify_active_uname="rabbitmq-bundle-0" CRM_meta_notify_all_uname="galera-bundle-0 rabbitmq-bundle-0 redis-bundle-0 undercloud" CRM_meta_notify_available_uname="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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rabbitmq:0" CRM_meta_notify_stop_uname="rabbitmq-bundle-0" CRM_meta_on_node="rabbitmq-bundle-0" CRM_meta_on_node_uuid="rabbitmq-bundle-0" CRM_meta_physical_host="undercloud" CRM_meta_timeout="200000" set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"/>
- </rsc_op>
- </action_set>
- <inputs>
-@@ -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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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 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=" " CRM_meta_notify_start_uname=" " 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/colo_master_w_native.exp b/pengine/test10/colo_master_w_native.exp
-index 2803879..ffa773f 100644
---- a/pengine/test10/colo_master_w_native.exp
-+++ b/pengine/test10/colo_master_w_native.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="44" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="43" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -85,7 +85,7 @@
- </synapse>
- <synapse id="6" priority="1000000">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -98,7 +98,7 @@
- </synapse>
- <synapse id="7">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -111,7 +111,7 @@
- </synapse>
- <synapse id="8" priority="1000000">
- <action_set>
-- <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="46" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -124,7 +124,7 @@
- </synapse>
- <synapse id="9">
- <action_set>
-- <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="45" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -171,10 +171,10 @@
- <pseudo_event id="35" operation="notify" operation_key="MS_RSC_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -204,10 +204,10 @@
- <pseudo_event id="33" operation="notify" operation_key="MS_RSC_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -257,10 +257,10 @@
- <pseudo_event id="29" operation="notify" operation_key="MS_RSC_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="44" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="46" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -290,10 +290,10 @@
- <pseudo_event id="27" operation="notify" operation_key="MS_RSC_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="43" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="45" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/colo_slave_w_native.exp b/pengine/test10/colo_slave_w_native.exp
-index e5ec984..a548923 100644
---- a/pengine/test10/colo_slave_w_native.exp
-+++ b/pengine/test10/colo_slave_w_native.exp
-@@ -36,7 +36,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -49,7 +49,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -62,7 +62,7 @@
- </synapse>
- <synapse id="5" priority="1000000">
- <action_set>
-- <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="45" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -75,7 +75,7 @@
- </synapse>
- <synapse id="6">
- <action_set>
-- <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
-+ <rsc_op id="44" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node2" CRM_meta_on_node_uuid="1048225984" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -120,7 +120,7 @@
- </synapse>
- <synapse id="9" priority="1000000">
- <action_set>
-- <rsc_op id="55" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -133,7 +133,7 @@
- </synapse>
- <synapse id="10">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -146,7 +146,7 @@
- </synapse>
- <synapse id="11" priority="1000000">
- <action_set>
-- <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -159,7 +159,7 @@
- </synapse>
- <synapse id="12">
- <action_set>
-- <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
-+ <rsc_op id="46" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
- <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="node1" CRM_meta_on_node_uuid="1031448768" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -206,10 +206,10 @@
- <pseudo_event id="36" operation="notify" operation_key="MS_RSC_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="55" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -239,10 +239,10 @@
- <pseudo_event id="34" operation="notify" operation_key="MS_RSC_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -292,10 +292,10 @@
- <pseudo_event id="30" operation="notify" operation_key="MS_RSC_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="45" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -325,10 +325,10 @@
- <pseudo_event id="28" operation="notify" operation_key="MS_RSC_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
-+ <rsc_op id="44" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984"/>
- </trigger>
- <trigger>
-- <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
-+ <rsc_op id="46" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/group-dependents.exp b/pengine/test10/group-dependents.exp
-index 607e9d7..0df62f0 100644
---- a/pengine/test10/group-dependents.exp
-+++ b/pengine/test10/group-dependents.exp
-@@ -1262,7 +1262,7 @@
- </synapse>
- <synapse id="85" priority="1000000">
- <action_set>
-- <rsc_op id="163" operation="notify" operation_key="drbd:0_post_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1">
-+ <rsc_op id="159" operation="notify" operation_key="drbd:0_post_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1">
- <primitive id="drbd" long-id="drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest1" CRM_meta_on_node_uuid="asttest1" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1275,7 +1275,7 @@
- </synapse>
- <synapse id="86">
- <action_set>
-- <rsc_op id="162" operation="notify" operation_key="drbd:0_pre_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1">
-+ <rsc_op id="158" operation="notify" operation_key="drbd:0_pre_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1">
- <primitive id="drbd" long-id="drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest1" CRM_meta_on_node_uuid="asttest1" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1288,7 +1288,7 @@
- </synapse>
- <synapse id="87" priority="1000000">
- <action_set>
-- <rsc_op id="159" operation="notify" operation_key="drbd:0_post_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1">
-+ <rsc_op id="155" operation="notify" operation_key="drbd:0_post_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1">
- <primitive id="drbd" long-id="drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest1" CRM_meta_on_node_uuid="asttest1" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1301,7 +1301,7 @@
- </synapse>
- <synapse id="88">
- <action_set>
-- <rsc_op id="158" operation="notify" operation_key="drbd:0_pre_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1">
-+ <rsc_op id="154" operation="notify" operation_key="drbd:0_pre_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1">
- <primitive id="drbd" long-id="drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest1" CRM_meta_on_node_uuid="asttest1" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1346,7 +1346,7 @@
- </synapse>
- <synapse id="91" priority="1000000">
- <action_set>
-- <rsc_op id="165" operation="notify" operation_key="drbd:1_post_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2">
-+ <rsc_op id="161" operation="notify" operation_key="drbd:1_post_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2">
- <primitive id="drbd" long-id="drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest2" CRM_meta_on_node_uuid="asttest2" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1359,7 +1359,7 @@
- </synapse>
- <synapse id="92">
- <action_set>
-- <rsc_op id="164" operation="notify" operation_key="drbd:1_pre_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2">
-+ <rsc_op id="160" operation="notify" operation_key="drbd:1_pre_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2">
- <primitive id="drbd" long-id="drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest2" CRM_meta_on_node_uuid="asttest2" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1372,7 +1372,7 @@
- </synapse>
- <synapse id="93" priority="1000000">
- <action_set>
-- <rsc_op id="161" operation="notify" operation_key="drbd:1_post_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2">
-+ <rsc_op id="157" operation="notify" operation_key="drbd:1_post_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2">
- <primitive id="drbd" long-id="drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest2" CRM_meta_on_node_uuid="asttest2" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1385,7 +1385,7 @@
- </synapse>
- <synapse id="94">
- <action_set>
-- <rsc_op id="160" operation="notify" operation_key="drbd:1_pre_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2">
-+ <rsc_op id="156" operation="notify" operation_key="drbd:1_pre_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2">
- <primitive id="drbd" long-id="drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="asttest2" CRM_meta_on_node_uuid="asttest2" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -1432,10 +1432,10 @@
- <pseudo_event id="140" operation="notify" operation_key="ms_drbd_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="163" operation="notify" operation_key="drbd:0_post_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1"/>
-+ <rsc_op id="159" operation="notify" operation_key="drbd:0_post_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1"/>
- </trigger>
- <trigger>
-- <rsc_op id="165" operation="notify" operation_key="drbd:1_post_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2"/>
-+ <rsc_op id="161" operation="notify" operation_key="drbd:1_post_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -1465,10 +1465,10 @@
- <pseudo_event id="138" operation="notify" operation_key="ms_drbd_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="162" operation="notify" operation_key="drbd:0_pre_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1"/>
-+ <rsc_op id="158" operation="notify" operation_key="drbd:0_pre_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1"/>
- </trigger>
- <trigger>
-- <rsc_op id="164" operation="notify" operation_key="drbd:1_pre_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2"/>
-+ <rsc_op id="160" operation="notify" operation_key="drbd:1_pre_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -1521,10 +1521,10 @@
- <pseudo_event id="134" operation="notify" operation_key="ms_drbd_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="159" operation="notify" operation_key="drbd:0_post_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1"/>
-+ <rsc_op id="155" operation="notify" operation_key="drbd:0_post_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1"/>
- </trigger>
- <trigger>
-- <rsc_op id="161" operation="notify" operation_key="drbd:1_post_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2"/>
-+ <rsc_op id="157" operation="notify" operation_key="drbd:1_post_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -1554,10 +1554,10 @@
- <pseudo_event id="132" operation="notify" operation_key="ms_drbd_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="158" operation="notify" operation_key="drbd:0_pre_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1"/>
-+ <rsc_op id="154" operation="notify" operation_key="drbd:0_pre_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1"/>
- </trigger>
- <trigger>
-- <rsc_op id="160" operation="notify" operation_key="drbd:1_pre_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2"/>
-+ <rsc_op id="156" operation="notify" operation_key="drbd:1_pre_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/inc10.exp b/pengine/test10/inc10.exp
-index 3779287..742d124 100644
---- a/pengine/test10/inc10.exp
-+++ b/pengine/test10/inc10.exp
-@@ -37,7 +37,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="ocfs2:1_post_notify_stop_0" internal_operation_key="ocfs2:0_post_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad">
-+ <rsc_op id="46" operation="notify" operation_key="ocfs2:1_post_notify_stop_0" internal_operation_key="ocfs2:0_post_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad">
- <primitive id="ocfs2" long-id="ocfs2:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="post" CRM_meta_on_node="xen-3" CRM_meta_on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -50,7 +50,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="51" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" internal_operation_key="ocfs2:0_pre_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad">
-+ <rsc_op id="45" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" internal_operation_key="ocfs2:0_pre_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad">
- <primitive id="ocfs2" long-id="ocfs2:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-3" CRM_meta_on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -63,7 +63,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" on_node="xen-2" on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282">
-+ <rsc_op id="47" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" on_node="xen-2" on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282">
- <primitive id="ocfs2" long-id="ocfs2:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -89,7 +89,7 @@
- </synapse>
- <synapse id="7" priority="1000000">
- <action_set>
-- <rsc_op id="55" operation="notify" operation_key="ocfs2:3_post_notify_stop_0" internal_operation_key="ocfs2:2_post_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5">
-+ <rsc_op id="49" operation="notify" operation_key="ocfs2:3_post_notify_stop_0" internal_operation_key="ocfs2:2_post_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5">
- <primitive id="ocfs2" long-id="ocfs2:3" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="post" CRM_meta_on_node="xen-1" CRM_meta_on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -102,7 +102,7 @@
- </synapse>
- <synapse id="8">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="ocfs2:3_pre_notify_stop_0" internal_operation_key="ocfs2:2_pre_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5">
-+ <rsc_op id="48" operation="notify" operation_key="ocfs2:3_pre_notify_stop_0" internal_operation_key="ocfs2:2_pre_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5">
- <primitive id="ocfs2" long-id="ocfs2:3" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-1" CRM_meta_on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -115,7 +115,7 @@
- </synapse>
- <synapse id="9" priority="1000000">
- <action_set>
-- <rsc_op id="57" operation="notify" operation_key="ocfs2:0_post_notify_stop_0" internal_operation_key="ocfs2:3_post_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426">
-+ <rsc_op id="51" operation="notify" operation_key="ocfs2:0_post_notify_stop_0" internal_operation_key="ocfs2:3_post_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426">
- <primitive id="ocfs2" long-id="ocfs2:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="post" CRM_meta_on_node="xen-4" CRM_meta_on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -128,7 +128,7 @@
- </synapse>
- <synapse id="10">
- <action_set>
-- <rsc_op id="56" operation="notify" operation_key="ocfs2:0_pre_notify_stop_0" internal_operation_key="ocfs2:3_pre_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426">
-+ <rsc_op id="50" operation="notify" operation_key="ocfs2:0_pre_notify_stop_0" internal_operation_key="ocfs2:3_pre_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426">
- <primitive id="ocfs2" long-id="ocfs2:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:2 ocfs2:3" CRM_meta_notify_active_uname="xen-3 xen-2 xen-1 xen-4" CRM_meta_notify_all_uname="xen-1 xen-2 xen-3 xen-4" CRM_meta_notify_available_uname="xen-3 xen-4 xen-1 xen-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="ocfs2:4" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ocfs2:1" CRM_meta_notify_stop_uname="xen-2" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-4" CRM_meta_on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426" CRM_meta_timeout="20000" device="/dev/hdb1" directory="/mnt/share1" fstype="ocfs2"/>
- </rsc_op>
-@@ -150,13 +150,13 @@
- <pseudo_event id="36" operation="notify" operation_key="ocfs2-clone_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="ocfs2:1_post_notify_stop_0" internal_operation_key="ocfs2:0_post_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad"/>
-+ <rsc_op id="46" operation="notify" operation_key="ocfs2:1_post_notify_stop_0" internal_operation_key="ocfs2:0_post_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad"/>
- </trigger>
- <trigger>
-- <rsc_op id="55" operation="notify" operation_key="ocfs2:3_post_notify_stop_0" internal_operation_key="ocfs2:2_post_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5"/>
-+ <rsc_op id="49" operation="notify" operation_key="ocfs2:3_post_notify_stop_0" internal_operation_key="ocfs2:2_post_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5"/>
- </trigger>
- <trigger>
-- <rsc_op id="57" operation="notify" operation_key="ocfs2:0_post_notify_stop_0" internal_operation_key="ocfs2:3_post_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426"/>
-+ <rsc_op id="51" operation="notify" operation_key="ocfs2:0_post_notify_stop_0" internal_operation_key="ocfs2:3_post_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -186,16 +186,16 @@
- <pseudo_event id="34" operation="notify" operation_key="ocfs2-clone_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="51" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" internal_operation_key="ocfs2:0_pre_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad"/>
-+ <rsc_op id="45" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" internal_operation_key="ocfs2:0_pre_notify_stop_0" on_node="xen-3" on_node_uuid="a89a7421-28b8-4d6e-b43f-3a9e563e24ad"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" on_node="xen-2" on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282"/>
-+ <rsc_op id="47" operation="notify" operation_key="ocfs2:1_pre_notify_stop_0" on_node="xen-2" on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="ocfs2:3_pre_notify_stop_0" internal_operation_key="ocfs2:2_pre_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5"/>
-+ <rsc_op id="48" operation="notify" operation_key="ocfs2:3_pre_notify_stop_0" internal_operation_key="ocfs2:2_pre_notify_stop_0" on_node="xen-1" on_node_uuid="43746e52-5e02-49bb-a110-c420078855c5"/>
- </trigger>
- <trigger>
-- <rsc_op id="56" operation="notify" operation_key="ocfs2:0_pre_notify_stop_0" internal_operation_key="ocfs2:3_pre_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426"/>
-+ <rsc_op id="50" operation="notify" operation_key="ocfs2:0_pre_notify_stop_0" internal_operation_key="ocfs2:3_pre_notify_stop_0" on_node="xen-4" on_node_uuid="bfbe2e3b-51c2-4419-b99e-eb85f9dd0426"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/interleave-pseudo-stop.exp b/pengine/test10/interleave-pseudo-stop.exp
-index 63217e8..97faf46 100644
---- a/pengine/test10/interleave-pseudo-stop.exp
-+++ b/pengine/test10/interleave-pseudo-stop.exp
-@@ -43,7 +43,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="78" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="76" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="evmsclone" long-id="evmsclone:1" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="evmsclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -159,7 +159,7 @@
- <pseudo_event id="24" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="78" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="76" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -209,7 +209,7 @@
- </synapse>
- <synapse id="14">
- <action_set>
-- <rsc_op id="81" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="77" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="imagestoreclone" long-id="imagestoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="imagestoreclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -319,7 +319,7 @@
- <pseudo_event id="39" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="81" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="77" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -363,7 +363,7 @@
- </synapse>
- <synapse id="25">
- <action_set>
-- <rsc_op id="84" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="78" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="configstoreclone" long-id="configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -473,7 +473,7 @@
- <pseudo_event id="54" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="84" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="78" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/interleave-stop.exp b/pengine/test10/interleave-stop.exp
-index a4c524f..35a8428 100644
---- a/pengine/test10/interleave-stop.exp
-+++ b/pengine/test10/interleave-stop.exp
-@@ -37,7 +37,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="72" operation="notify" operation_key="evmsclone:1_post_notify_stop_0" internal_operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="70" operation="notify" operation_key="evmsclone:1_post_notify_stop_0" internal_operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="evmsclone" long-id="evmsclone:1" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="evmsclone:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -50,7 +50,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="71" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="69" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="evmsclone" long-id="evmsclone:1" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="evmsclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -63,7 +63,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="73" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" internal_operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
-+ <rsc_op id="71" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" internal_operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
- <primitive id="evmsclone" long-id="evmsclone:0" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="evmsclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -104,7 +104,7 @@
- <pseudo_event id="28" operation="notify" operation_key="evmscloneset_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="72" operation="notify" operation_key="evmsclone:1_post_notify_stop_0" internal_operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="70" operation="notify" operation_key="evmsclone:1_post_notify_stop_0" internal_operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -134,10 +134,10 @@
- <pseudo_event id="26" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="71" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="69" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- <trigger>
-- <rsc_op id="73" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" internal_operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
-+ <rsc_op id="71" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" internal_operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -184,7 +184,7 @@
- </synapse>
- <synapse id="13" priority="1000000">
- <action_set>
-- <rsc_op id="77" operation="notify" operation_key="imagestoreclone:1_post_notify_stop_0" internal_operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="73" operation="notify" operation_key="imagestoreclone:1_post_notify_stop_0" internal_operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="imagestoreclone" long-id="imagestoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="imagestoreclone:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -197,7 +197,7 @@
- </synapse>
- <synapse id="14">
- <action_set>
-- <rsc_op id="76" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="72" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="imagestoreclone" long-id="imagestoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="imagestoreclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -210,7 +210,7 @@
- </synapse>
- <synapse id="15">
- <action_set>
-- <rsc_op id="78" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
-+ <rsc_op id="74" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
- <primitive id="imagestoreclone" long-id="imagestoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="imagestoreclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -245,7 +245,7 @@
- <pseudo_event id="43" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="77" operation="notify" operation_key="imagestoreclone:1_post_notify_stop_0" internal_operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="73" operation="notify" operation_key="imagestoreclone:1_post_notify_stop_0" internal_operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -275,10 +275,10 @@
- <pseudo_event id="41" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="76" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="72" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- <trigger>
-- <rsc_op id="78" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
-+ <rsc_op id="74" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -319,7 +319,7 @@
- </synapse>
- <synapse id="23" priority="1000000">
- <action_set>
-- <rsc_op id="82" operation="notify" operation_key="configstoreclone:1_post_notify_stop_0" internal_operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="76" operation="notify" operation_key="configstoreclone:1_post_notify_stop_0" internal_operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="configstoreclone" long-id="configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -332,7 +332,7 @@
- </synapse>
- <synapse id="24">
- <action_set>
-- <rsc_op id="81" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
-+ <rsc_op id="75" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5">
- <primitive id="configstoreclone" long-id="configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -345,7 +345,7 @@
- </synapse>
- <synapse id="25">
- <action_set>
-- <rsc_op id="83" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
-+ <rsc_op id="77" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
- <primitive id="configstoreclone" long-id="configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -380,7 +380,7 @@
- <pseudo_event id="58" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="82" operation="notify" operation_key="configstoreclone:1_post_notify_stop_0" internal_operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="76" operation="notify" operation_key="configstoreclone:1_post_notify_stop_0" internal_operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -410,10 +410,10 @@
- <pseudo_event id="56" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="81" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
-+ <rsc_op id="75" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
- </trigger>
- <trigger>
-- <rsc_op id="83" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
-+ <rsc_op id="77" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-13.exp b/pengine/test10/master-13.exp
-index 1e09ee1..94b8d59 100644
---- a/pengine/test10/master-13.exp
-+++ b/pengine/test10/master-13.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="61" operation="notify" operation_key="drbd0:1_post_notify_demote_0" internal_operation_key="drbd0:0_post_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
-+ <rsc_op id="57" operation="notify" operation_key="drbd0:1_post_notify_demote_0" internal_operation_key="drbd0:0_post_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="odin" CRM_meta_on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="60" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" internal_operation_key="drbd0:0_pre_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
-+ <rsc_op id="56" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" internal_operation_key="drbd0:0_pre_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="odin" CRM_meta_on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="57" operation="notify" operation_key="drbd0:1_post_notify_promote_0" internal_operation_key="drbd0:0_post_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
-+ <rsc_op id="53" operation="notify" operation_key="drbd0:1_post_notify_promote_0" internal_operation_key="drbd0:0_post_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="odin" CRM_meta_on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="56" operation="notify" operation_key="drbd0:1_pre_notify_promote_0" internal_operation_key="drbd0:0_pre_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
-+ <rsc_op id="52" operation="notify" operation_key="drbd0:1_pre_notify_promote_0" internal_operation_key="drbd0:0_pre_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="odin" CRM_meta_on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -97,7 +97,7 @@
- </synapse>
- <synapse id="7" priority="1000000">
- <action_set>
-- <rsc_op id="63" operation="notify" operation_key="drbd0:0_post_notify_demote_0" internal_operation_key="drbd0:1_post_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
-+ <rsc_op id="59" operation="notify" operation_key="drbd0:0_post_notify_demote_0" internal_operation_key="drbd0:1_post_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="frigg" CRM_meta_on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -110,7 +110,7 @@
- </synapse>
- <synapse id="8">
- <action_set>
-- <rsc_op id="62" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" internal_operation_key="drbd0:1_pre_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
-+ <rsc_op id="58" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" internal_operation_key="drbd0:1_pre_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="frigg" CRM_meta_on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -123,7 +123,7 @@
- </synapse>
- <synapse id="9" priority="1000000">
- <action_set>
-- <rsc_op id="59" operation="notify" operation_key="drbd0:0_post_notify_promote_0" internal_operation_key="drbd0:1_post_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
-+ <rsc_op id="55" operation="notify" operation_key="drbd0:0_post_notify_promote_0" internal_operation_key="drbd0:1_post_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="frigg" CRM_meta_on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -136,7 +136,7 @@
- </synapse>
- <synapse id="10">
- <action_set>
-- <rsc_op id="58" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" internal_operation_key="drbd0:1_pre_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
-+ <rsc_op id="54" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" internal_operation_key="drbd0:1_pre_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="frigg" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="frigg" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="odin" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="odin" 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="frigg" CRM_meta_on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" CRM_meta_timeout="5000" drbd_resource="r0"/>
- </rsc_op>
-@@ -202,10 +202,10 @@
- <pseudo_event id="34" operation="notify" operation_key="ms_drbd_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="61" operation="notify" operation_key="drbd0:1_post_notify_demote_0" internal_operation_key="drbd0:0_post_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
-+ <rsc_op id="57" operation="notify" operation_key="drbd0:1_post_notify_demote_0" internal_operation_key="drbd0:0_post_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
- </trigger>
- <trigger>
-- <rsc_op id="63" operation="notify" operation_key="drbd0:0_post_notify_demote_0" internal_operation_key="drbd0:1_post_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
-+ <rsc_op id="59" operation="notify" operation_key="drbd0:0_post_notify_demote_0" internal_operation_key="drbd0:1_post_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -235,10 +235,10 @@
- <pseudo_event id="32" operation="notify" operation_key="ms_drbd_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="60" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" internal_operation_key="drbd0:0_pre_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
-+ <rsc_op id="56" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" internal_operation_key="drbd0:0_pre_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
- </trigger>
- <trigger>
-- <rsc_op id="62" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" internal_operation_key="drbd0:1_pre_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
-+ <rsc_op id="58" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" internal_operation_key="drbd0:1_pre_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -288,10 +288,10 @@
- <pseudo_event id="28" operation="notify" operation_key="ms_drbd_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="57" operation="notify" operation_key="drbd0:1_post_notify_promote_0" internal_operation_key="drbd0:0_post_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
-+ <rsc_op id="53" operation="notify" operation_key="drbd0:1_post_notify_promote_0" internal_operation_key="drbd0:0_post_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
- </trigger>
- <trigger>
-- <rsc_op id="59" operation="notify" operation_key="drbd0:0_post_notify_promote_0" internal_operation_key="drbd0:1_post_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
-+ <rsc_op id="55" operation="notify" operation_key="drbd0:0_post_notify_promote_0" internal_operation_key="drbd0:1_post_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -321,10 +321,10 @@
- <pseudo_event id="26" operation="notify" operation_key="ms_drbd_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="56" operation="notify" operation_key="drbd0:1_pre_notify_promote_0" internal_operation_key="drbd0:0_pre_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
-+ <rsc_op id="52" operation="notify" operation_key="drbd0:1_pre_notify_promote_0" internal_operation_key="drbd0:0_pre_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
- </trigger>
- <trigger>
-- <rsc_op id="58" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" internal_operation_key="drbd0:1_pre_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
-+ <rsc_op id="54" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" internal_operation_key="drbd0:1_pre_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-demote.exp b/pengine/test10/master-demote.exp
-index 8909056..91cd0bc 100644
---- a/pengine/test10/master-demote.exp
-+++ b/pengine/test10/master-demote.exp
-@@ -23,7 +23,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="125" operation="notify" operation_key="named_drbd_node:1_post_notify_promote_0" internal_operation_key="named_drbd_node:0_post_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2">
-+ <rsc_op id="109" operation="notify" operation_key="named_drbd_node:1_post_notify_promote_0" internal_operation_key="named_drbd_node:0_post_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2">
- <primitive id="named_drbd_node" long-id="named_drbd_node:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node: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="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="cxa1" CRM_meta_on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2" CRM_meta_timeout="20000" drbd_resource="drbd4"/>
- </rsc_op>
-@@ -36,7 +36,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="124" operation="notify" operation_key="named_drbd_node:1_pre_notify_promote_0" internal_operation_key="named_drbd_node:0_pre_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2">
-+ <rsc_op id="108" operation="notify" operation_key="named_drbd_node:1_pre_notify_promote_0" internal_operation_key="named_drbd_node:0_pre_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2">
- <primitive id="named_drbd_node" long-id="named_drbd_node:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node: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="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="cxa1" CRM_meta_on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2" CRM_meta_timeout="20000" drbd_resource="drbd4"/>
- </rsc_op>
-@@ -49,7 +49,7 @@
- </synapse>
- <synapse id="4" priority="1000000">
- <action_set>
-- <rsc_op id="127" operation="notify" operation_key="named_drbd_node:0_post_notify_promote_0" internal_operation_key="named_drbd_node:1_post_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
-+ <rsc_op id="111" operation="notify" operation_key="named_drbd_node:0_post_notify_promote_0" internal_operation_key="named_drbd_node:1_post_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
- <primitive id="named_drbd_node" long-id="named_drbd_node:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node: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="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="cxb1" CRM_meta_on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045" CRM_meta_timeout="20000" drbd_resource="drbd4"/>
- </rsc_op>
-@@ -62,7 +62,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="126" operation="notify" operation_key="named_drbd_node:0_pre_notify_promote_0" internal_operation_key="named_drbd_node:1_pre_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
-+ <rsc_op id="110" operation="notify" operation_key="named_drbd_node:0_pre_notify_promote_0" internal_operation_key="named_drbd_node:1_pre_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
- <primitive id="named_drbd_node" long-id="named_drbd_node:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node: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="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="cxb1" CRM_meta_on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045" CRM_meta_timeout="20000" drbd_resource="drbd4"/>
- </rsc_op>
-@@ -113,10 +113,10 @@
- <pseudo_event id="63" operation="notify" operation_key="named_drbd_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="125" operation="notify" operation_key="named_drbd_node:1_post_notify_promote_0" internal_operation_key="named_drbd_node:0_post_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2"/>
-+ <rsc_op id="109" operation="notify" operation_key="named_drbd_node:1_post_notify_promote_0" internal_operation_key="named_drbd_node:0_post_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2"/>
- </trigger>
- <trigger>
-- <rsc_op id="127" operation="notify" operation_key="named_drbd_node:0_post_notify_promote_0" internal_operation_key="named_drbd_node:1_post_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045"/>
-+ <rsc_op id="111" operation="notify" operation_key="named_drbd_node:0_post_notify_promote_0" internal_operation_key="named_drbd_node:1_post_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -146,10 +146,10 @@
- <pseudo_event id="61" operation="notify" operation_key="named_drbd_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="124" operation="notify" operation_key="named_drbd_node:1_pre_notify_promote_0" internal_operation_key="named_drbd_node:0_pre_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2"/>
-+ <rsc_op id="108" operation="notify" operation_key="named_drbd_node:1_pre_notify_promote_0" internal_operation_key="named_drbd_node:0_pre_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2"/>
- </trigger>
- <trigger>
-- <rsc_op id="126" operation="notify" operation_key="named_drbd_node:0_pre_notify_promote_0" internal_operation_key="named_drbd_node:1_pre_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045"/>
-+ <rsc_op id="110" operation="notify" operation_key="named_drbd_node:0_pre_notify_promote_0" internal_operation_key="named_drbd_node:1_pre_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-dependent-ban.exp b/pengine/test10/master-dependent-ban.exp
-index 99a6e94..caea6e3 100644
---- a/pengine/test10/master-dependent-ban.exp
-+++ b/pengine/test10/master-dependent-ban.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="48" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_post_notify_promote_0" on_node="c7" on_node_uuid="168822234">
-+ <rsc_op id="44" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_post_notify_promote_0" on_node="c7" on_node_uuid="168822234">
- <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1: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="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="c7" CRM_meta_on_node_uuid="168822234" CRM_meta_timeout="90000" drbd_resource="dtest1"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="47" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_pre_notify_promote_0" on_node="c7" on_node_uuid="168822234">
-+ <rsc_op id="43" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_pre_notify_promote_0" on_node="c7" on_node_uuid="168822234">
- <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1: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="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="c7" CRM_meta_on_node_uuid="168822234" CRM_meta_timeout="90000" drbd_resource="dtest1"/>
- </rsc_op>
-@@ -56,7 +56,7 @@
- </synapse>
- <synapse id="4" priority="1000000">
- <action_set>
-- <rsc_op id="50" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_post_notify_promote_0" on_node="c6" on_node_uuid="168822233">
-+ <rsc_op id="46" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_post_notify_promote_0" on_node="c6" on_node_uuid="168822233">
- <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1: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="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="c6" CRM_meta_on_node_uuid="168822233" CRM_meta_timeout="90000" drbd_resource="dtest1"/>
- </rsc_op>
-@@ -69,7 +69,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="49" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_pre_notify_promote_0" on_node="c6" on_node_uuid="168822233">
-+ <rsc_op id="45" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_pre_notify_promote_0" on_node="c6" on_node_uuid="168822233">
- <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1: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="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="c6" CRM_meta_on_node_uuid="168822233" CRM_meta_timeout="90000" drbd_resource="dtest1"/>
- </rsc_op>
-@@ -104,10 +104,10 @@
- <pseudo_event id="25" operation="notify" operation_key="ms_drbd-dtest1_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="48" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_post_notify_promote_0" on_node="c7" on_node_uuid="168822234"/>
-+ <rsc_op id="44" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_post_notify_promote_0" on_node="c7" on_node_uuid="168822234"/>
- </trigger>
- <trigger>
-- <rsc_op id="50" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_post_notify_promote_0" on_node="c6" on_node_uuid="168822233"/>
-+ <rsc_op id="46" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_post_notify_promote_0" on_node="c6" on_node_uuid="168822233"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -137,10 +137,10 @@
- <pseudo_event id="23" operation="notify" operation_key="ms_drbd-dtest1_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="47" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_pre_notify_promote_0" on_node="c7" on_node_uuid="168822234"/>
-+ <rsc_op id="43" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_pre_notify_promote_0" on_node="c7" on_node_uuid="168822234"/>
- </trigger>
- <trigger>
-- <rsc_op id="49" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_pre_notify_promote_0" on_node="c6" on_node_uuid="168822233"/>
-+ <rsc_op id="45" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_pre_notify_promote_0" on_node="c6" on_node_uuid="168822233"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-failed-demote.exp b/pengine/test10/master-failed-demote.exp
-index 1d27dc5..7cbfdfa 100644
---- a/pengine/test10/master-failed-demote.exp
-+++ b/pengine/test10/master-failed-demote.exp
-@@ -28,7 +28,7 @@
- </synapse>
- <synapse id="2">
- <action_set>
-- <rsc_op id="63" operation="notify" operation_key="stateful-1:0_pre_notify_stop_0" on_node="dl380g5b" on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4">
-+ <rsc_op id="59" operation="notify" operation_key="stateful-1:0_pre_notify_stop_0" on_node="dl380g5b" on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4">
- <primitive id="stateful-1:0" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_on_node="dl380g5b" CRM_meta_on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -81,7 +81,7 @@
- </synapse>
- <synapse id="6" priority="1000000">
- <action_set>
-- <rsc_op id="69" operation="notify" operation_key="stateful-1:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="65" operation="notify" operation_key="stateful-1:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" 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="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -94,7 +94,7 @@
- </synapse>
- <synapse id="7">
- <action_set>
-- <rsc_op id="68" operation="notify" operation_key="stateful-1:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="64" operation="notify" operation_key="stateful-1:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" 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="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -107,7 +107,7 @@
- </synapse>
- <synapse id="8" priority="1000000">
- <action_set>
-- <rsc_op id="65" operation="notify" operation_key="stateful-1:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="61" operation="notify" operation_key="stateful-1:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -120,7 +120,7 @@
- </synapse>
- <synapse id="9">
- <action_set>
-- <rsc_op id="64" operation="notify" operation_key="stateful-1:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="60" operation="notify" operation_key="stateful-1:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -177,7 +177,7 @@
- </synapse>
- <synapse id="13" priority="1000000">
- <action_set>
-- <rsc_op id="71" operation="notify" operation_key="stateful-2:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="67" operation="notify" operation_key="stateful-2:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" 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="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -190,7 +190,7 @@
- </synapse>
- <synapse id="14">
- <action_set>
-- <rsc_op id="70" operation="notify" operation_key="stateful-2:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="66" operation="notify" operation_key="stateful-2:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" 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="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -203,7 +203,7 @@
- </synapse>
- <synapse id="15" priority="1000000">
- <action_set>
-- <rsc_op id="67" operation="notify" operation_key="stateful-2:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="63" operation="notify" operation_key="stateful-2:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -216,7 +216,7 @@
- </synapse>
- <synapse id="16">
- <action_set>
-- <rsc_op id="66" operation="notify" operation_key="stateful-2:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
-+ <rsc_op id="62" operation="notify" operation_key="stateful-2:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
- <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_on_node="dl380g5a" CRM_meta_on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3" CRM_meta_timeout="120000" />
- </rsc_op>
-@@ -285,10 +285,10 @@
- <pseudo_event id="45" operation="notify" operation_key="ms-sf_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="69" operation="notify" operation_key="stateful-1:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="65" operation="notify" operation_key="stateful-1:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- <trigger>
-- <rsc_op id="71" operation="notify" operation_key="stateful-2:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="67" operation="notify" operation_key="stateful-2:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -318,10 +318,10 @@
- <pseudo_event id="43" operation="notify" operation_key="ms-sf_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="68" operation="notify" operation_key="stateful-1:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="64" operation="notify" operation_key="stateful-1:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- <trigger>
-- <rsc_op id="70" operation="notify" operation_key="stateful-2:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="66" operation="notify" operation_key="stateful-2:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -375,10 +375,10 @@
- <pseudo_event id="39" operation="notify" operation_key="ms-sf_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="65" operation="notify" operation_key="stateful-1:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="61" operation="notify" operation_key="stateful-1:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- <trigger>
-- <rsc_op id="67" operation="notify" operation_key="stateful-2:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="63" operation="notify" operation_key="stateful-2:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -408,13 +408,13 @@
- <pseudo_event id="37" operation="notify" operation_key="ms-sf_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="63" operation="notify" operation_key="stateful-1:0_pre_notify_stop_0" on_node="dl380g5b" on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4"/>
-+ <rsc_op id="59" operation="notify" operation_key="stateful-1:0_pre_notify_stop_0" on_node="dl380g5b" on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4"/>
- </trigger>
- <trigger>
-- <rsc_op id="64" operation="notify" operation_key="stateful-1:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="60" operation="notify" operation_key="stateful-1:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- <trigger>
-- <rsc_op id="66" operation="notify" operation_key="stateful-2:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
-+ <rsc_op id="62" operation="notify" operation_key="stateful-2:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-move.exp b/pengine/test10/master-move.exp
-index e77005f..536e583 100644
---- a/pengine/test10/master-move.exp
-+++ b/pengine/test10/master-move.exp
-@@ -182,7 +182,7 @@
- </synapse>
- <synapse id="12" priority="1000000">
- <action_set>
-- <rsc_op id="65" operation="notify" operation_key="prmDRBD:0_post_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
-+ <rsc_op id="61" operation="notify" operation_key="prmDRBD:0_post_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
- <primitive id="prmDRBD" long-id="prmDRBD:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n13" CRM_meta_on_node_uuid="11111111-1111-1111-1111-111111111111" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -195,7 +195,7 @@
- </synapse>
- <synapse id="13">
- <action_set>
-- <rsc_op id="64" operation="notify" operation_key="prmDRBD:0_pre_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
-+ <rsc_op id="60" operation="notify" operation_key="prmDRBD:0_pre_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
- <primitive id="prmDRBD" long-id="prmDRBD:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n13" CRM_meta_on_node_uuid="11111111-1111-1111-1111-111111111111" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -208,7 +208,7 @@
- </synapse>
- <synapse id="14" priority="1000000">
- <action_set>
-- <rsc_op id="61" operation="notify" operation_key="prmDRBD:0_post_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
-+ <rsc_op id="57" operation="notify" operation_key="prmDRBD:0_post_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
- <primitive id="prmDRBD" long-id="prmDRBD:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n13" CRM_meta_on_node_uuid="11111111-1111-1111-1111-111111111111" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -221,7 +221,7 @@
- </synapse>
- <synapse id="15">
- <action_set>
-- <rsc_op id="60" operation="notify" operation_key="prmDRBD:0_pre_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
-+ <rsc_op id="56" operation="notify" operation_key="prmDRBD:0_pre_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
- <primitive id="prmDRBD" long-id="prmDRBD:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n13" CRM_meta_on_node_uuid="11111111-1111-1111-1111-111111111111" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -278,7 +278,7 @@
- </synapse>
- <synapse id="19" priority="1000000">
- <action_set>
-- <rsc_op id="67" operation="notify" operation_key="prmDRBD:1_post_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
-+ <rsc_op id="63" operation="notify" operation_key="prmDRBD:1_post_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
- <primitive id="prmDRBD" long-id="prmDRBD:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n14" CRM_meta_on_node_uuid="22222222-2222-2222-2222-222222222222" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -291,7 +291,7 @@
- </synapse>
- <synapse id="20">
- <action_set>
-- <rsc_op id="66" operation="notify" operation_key="prmDRBD:1_pre_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
-+ <rsc_op id="62" operation="notify" operation_key="prmDRBD:1_pre_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
- <primitive id="prmDRBD" long-id="prmDRBD:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n14" CRM_meta_on_node_uuid="22222222-2222-2222-2222-222222222222" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -304,7 +304,7 @@
- </synapse>
- <synapse id="21" priority="1000000">
- <action_set>
-- <rsc_op id="63" operation="notify" operation_key="prmDRBD:1_post_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
-+ <rsc_op id="59" operation="notify" operation_key="prmDRBD:1_post_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
- <primitive id="prmDRBD" long-id="prmDRBD:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n14" CRM_meta_on_node_uuid="22222222-2222-2222-2222-222222222222" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -317,7 +317,7 @@
- </synapse>
- <synapse id="22">
- <action_set>
-- <rsc_op id="62" operation="notify" operation_key="prmDRBD:1_pre_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
-+ <rsc_op id="58" operation="notify" operation_key="prmDRBD:1_pre_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
- <primitive id="prmDRBD" long-id="prmDRBD:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="bl460g1n14" CRM_meta_on_node_uuid="22222222-2222-2222-2222-222222222222" CRM_meta_timeout="20000" drbd_resource="r0"/>
- </rsc_op>
-@@ -383,10 +383,10 @@
- <pseudo_event id="48" operation="notify" operation_key="msDRBD_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="65" operation="notify" operation_key="prmDRBD:0_post_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
-+ <rsc_op id="61" operation="notify" operation_key="prmDRBD:0_post_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
- </trigger>
- <trigger>
-- <rsc_op id="67" operation="notify" operation_key="prmDRBD:1_post_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
-+ <rsc_op id="63" operation="notify" operation_key="prmDRBD:1_post_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -416,10 +416,10 @@
- <pseudo_event id="46" operation="notify" operation_key="msDRBD_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="64" operation="notify" operation_key="prmDRBD:0_pre_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
-+ <rsc_op id="60" operation="notify" operation_key="prmDRBD:0_pre_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
- </trigger>
- <trigger>
-- <rsc_op id="66" operation="notify" operation_key="prmDRBD:1_pre_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
-+ <rsc_op id="62" operation="notify" operation_key="prmDRBD:1_pre_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -472,10 +472,10 @@
- <pseudo_event id="42" operation="notify" operation_key="msDRBD_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="61" operation="notify" operation_key="prmDRBD:0_post_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
-+ <rsc_op id="57" operation="notify" operation_key="prmDRBD:0_post_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
- </trigger>
- <trigger>
-- <rsc_op id="63" operation="notify" operation_key="prmDRBD:1_post_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
-+ <rsc_op id="59" operation="notify" operation_key="prmDRBD:1_post_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -505,10 +505,10 @@
- <pseudo_event id="40" operation="notify" operation_key="msDRBD_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="60" operation="notify" operation_key="prmDRBD:0_pre_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
-+ <rsc_op id="56" operation="notify" operation_key="prmDRBD:0_pre_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111"/>
- </trigger>
- <trigger>
-- <rsc_op id="62" operation="notify" operation_key="prmDRBD:1_pre_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
-+ <rsc_op id="58" operation="notify" operation_key="prmDRBD:1_pre_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-notify.exp b/pengine/test10/master-notify.exp
-index 0f6295c..7a73136 100644
---- a/pengine/test10/master-notify.exp
-+++ b/pengine/test10/master-notify.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="52" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:0_post_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
-+ <rsc_op id="46" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:0_post_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
- <primitive id="fake" long-id="fake:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="rhel7-auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="51" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:0_pre_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
-+ <rsc_op id="45" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:0_pre_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
- <primitive id="fake" long-id="fake:0" class="ocf" provider="pacemaker" type="Stateful"/>
- <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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="rhel7-auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:1_post_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3">
-+ <rsc_op id="48" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:1_post_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3">
- <primitive id="fake" long-id="fake:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="rhel7-auto3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:1_pre_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3">
-+ <rsc_op id="47" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:1_pre_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3">
- <primitive id="fake" long-id="fake:1" class="ocf" provider="pacemaker" type="Stateful"/>
- <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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="rhel7-auto3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -66,7 +66,7 @@
- </synapse>
- <synapse id="5" priority="1000000">
- <action_set>
-- <rsc_op id="56" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:2_post_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2">
-+ <rsc_op id="50" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:2_post_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2">
- <primitive id="fake" long-id="fake:2" class="ocf" provider="pacemaker" type="Stateful"/>
- <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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -79,7 +79,7 @@
- </synapse>
- <synapse id="6">
- <action_set>
-- <rsc_op id="55" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:2_pre_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2">
-+ <rsc_op id="49" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:2_pre_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2">
- <primitive id="fake" long-id="fake:2" class="ocf" provider="pacemaker" type="Stateful"/>
- <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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="rhel7-auto2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -101,13 +101,13 @@
- <pseudo_event id="28" operation="notify" operation_key="fake-master_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="52" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:0_post_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1"/>
-+ <rsc_op id="46" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:0_post_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:1_post_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3"/>
-+ <rsc_op id="48" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:1_post_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3"/>
- </trigger>
- <trigger>
-- <rsc_op id="56" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:2_post_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2"/>
-+ <rsc_op id="50" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:2_post_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -137,13 +137,13 @@
- <pseudo_event id="26" operation="notify" operation_key="fake-master_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="51" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:0_pre_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1"/>
-+ <rsc_op id="45" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:0_pre_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:1_pre_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3"/>
-+ <rsc_op id="47" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:1_pre_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3"/>
- </trigger>
- <trigger>
-- <rsc_op id="55" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:2_pre_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2"/>
-+ <rsc_op id="49" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:2_pre_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/master-partially-demoted-group.exp b/pengine/test10/master-partially-demoted-group.exp
-index fecf3c5..32a30fe 100644
---- a/pengine/test10/master-partially-demoted-group.exp
-+++ b/pengine/test10/master-partially-demoted-group.exp
-@@ -493,7 +493,7 @@
- </synapse>
- <synapse id="34" priority="1000000">
- <action_set>
-- <rsc_op id="138" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_demote_0" on_node="sd01-1" on_node_uuid="2">
-+ <rsc_op id="134" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_demote_0" on_node="sd01-1" on_node_uuid="2">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -506,7 +506,7 @@
- </synapse>
- <synapse id="35">
- <action_set>
-- <rsc_op id="137" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_demote_0" on_node="sd01-1" on_node_uuid="2">
-+ <rsc_op id="133" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_demote_0" on_node="sd01-1" on_node_uuid="2">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -519,7 +519,7 @@
- </synapse>
- <synapse id="36" priority="1000000">
- <action_set>
-- <rsc_op id="134" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_promote_0" on_node="sd01-1" on_node_uuid="2">
-+ <rsc_op id="130" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_promote_0" on_node="sd01-1" on_node_uuid="2">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -532,7 +532,7 @@
- </synapse>
- <synapse id="37">
- <action_set>
-- <rsc_op id="133" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_promote_0" on_node="sd01-1" on_node_uuid="2">
-+ <rsc_op id="129" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_promote_0" on_node="sd01-1" on_node_uuid="2">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -577,7 +577,7 @@
- </synapse>
- <synapse id="40" priority="1000000">
- <action_set>
-- <rsc_op id="140" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_demote_0" on_node="sd01-0" on_node_uuid="1">
-+ <rsc_op id="136" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_demote_0" on_node="sd01-0" on_node_uuid="1">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -590,7 +590,7 @@
- </synapse>
- <synapse id="41">
- <action_set>
-- <rsc_op id="139" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_demote_0" on_node="sd01-0" on_node_uuid="1">
-+ <rsc_op id="135" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_demote_0" on_node="sd01-0" on_node_uuid="1">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -603,7 +603,7 @@
- </synapse>
- <synapse id="42" priority="1000000">
- <action_set>
-- <rsc_op id="136" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_promote_0" on_node="sd01-0" on_node_uuid="1">
-+ <rsc_op id="132" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_promote_0" on_node="sd01-0" on_node_uuid="1">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -616,7 +616,7 @@
- </synapse>
- <synapse id="43">
- <action_set>
-- <rsc_op id="135" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_promote_0" on_node="sd01-0" on_node_uuid="1">
-+ <rsc_op id="131" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_promote_0" on_node="sd01-0" on_node_uuid="1">
- <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" class="ocf" provider="linbit" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-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="sd01-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" drbd_resource="cdev-pool-0"/>
- </rsc_op>
-@@ -670,10 +670,10 @@
- <pseudo_event id="103" operation="notify" operation_key="ms-cdev-pool-0-drbd_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="138" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_demote_0" on_node="sd01-1" on_node_uuid="2"/>
-+ <rsc_op id="134" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_demote_0" on_node="sd01-1" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <rsc_op id="140" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_demote_0" on_node="sd01-0" on_node_uuid="1"/>
-+ <rsc_op id="136" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_demote_0" on_node="sd01-0" on_node_uuid="1"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -703,10 +703,10 @@
- <pseudo_event id="101" operation="notify" operation_key="ms-cdev-pool-0-drbd_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="137" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_demote_0" on_node="sd01-1" on_node_uuid="2"/>
-+ <rsc_op id="133" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_demote_0" on_node="sd01-1" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <rsc_op id="139" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_demote_0" on_node="sd01-0" on_node_uuid="1"/>
-+ <rsc_op id="135" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_demote_0" on_node="sd01-0" on_node_uuid="1"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -759,10 +759,10 @@
- <pseudo_event id="97" operation="notify" operation_key="ms-cdev-pool-0-drbd_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="134" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_promote_0" on_node="sd01-1" on_node_uuid="2"/>
-+ <rsc_op id="130" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_promote_0" on_node="sd01-1" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <rsc_op id="136" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_promote_0" on_node="sd01-0" on_node_uuid="1"/>
-+ <rsc_op id="132" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_promote_0" on_node="sd01-0" on_node_uuid="1"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -792,10 +792,10 @@
- <pseudo_event id="95" operation="notify" operation_key="ms-cdev-pool-0-drbd_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="133" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_promote_0" on_node="sd01-1" on_node_uuid="2"/>
-+ <rsc_op id="129" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_promote_0" on_node="sd01-1" on_node_uuid="2"/>
- </trigger>
- <trigger>
-- <rsc_op id="135" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_promote_0" on_node="sd01-0" on_node_uuid="1"/>
-+ <rsc_op id="131" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_promote_0" on_node="sd01-0" on_node_uuid="1"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/novell-239082.exp b/pengine/test10/novell-239082.exp
-index 9453656..c6d0221 100644
---- a/pengine/test10/novell-239082.exp
-+++ b/pengine/test10/novell-239082.exp
-@@ -26,7 +26,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="48" operation="notify" operation_key="drbd0:0_post_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
-+ <rsc_op id="46" operation="notify" operation_key="drbd0:0_post_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -39,7 +39,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="47" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
-+ <rsc_op id="45" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -52,7 +52,7 @@
- </synapse>
- <synapse id="4" priority="1000000">
- <action_set>
-- <rsc_op id="46" operation="notify" operation_key="drbd0:0_post_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
-+ <rsc_op id="44" operation="notify" operation_key="drbd0:0_post_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -65,7 +65,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="45" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
-+ <rsc_op id="43" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -78,7 +78,7 @@
- </synapse>
- <synapse id="6" priority="1000000">
- <action_set>
-- <rsc_op id="43" operation="notify" operation_key="drbd0:0_post_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
-+ <rsc_op id="41" operation="notify" operation_key="drbd0:0_post_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -91,7 +91,7 @@
- </synapse>
- <synapse id="7">
- <action_set>
-- <rsc_op id="42" operation="notify" operation_key="drbd0:0_pre_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
-+ <rsc_op id="40" operation="notify" operation_key="drbd0:0_pre_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
- <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-2" CRM_meta_on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -117,7 +117,7 @@
- </synapse>
- <synapse id="9" priority="1000000">
- <action_set>
-- <rsc_op id="50" operation="notify" operation_key="drbd0:1_post_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
-+ <rsc_op id="48" operation="notify" operation_key="drbd0:1_post_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_on_node="xen-1" CRM_meta_on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -130,7 +130,7 @@
- </synapse>
- <synapse id="10">
- <action_set>
-- <rsc_op id="49" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
-+ <rsc_op id="47" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-1" CRM_meta_on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -143,7 +143,7 @@
- </synapse>
- <synapse id="11">
- <action_set>
-- <rsc_op id="44" operation="notify" operation_key="drbd0:1_pre_notify_stop_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
-+ <rsc_op id="42" operation="notify" operation_key="drbd0:1_pre_notify_stop_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
- <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_on_node="xen-1" CRM_meta_on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9" CRM_meta_timeout="120000" clone_overrides_hostname="no" drbd_resource="r0"/>
- </rsc_op>
-@@ -194,10 +194,10 @@
- <pseudo_event id="31" operation="notify" operation_key="ms-drbd0_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="48" operation="notify" operation_key="drbd0:0_post_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
-+ <rsc_op id="46" operation="notify" operation_key="drbd0:0_post_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
- </trigger>
- <trigger>
-- <rsc_op id="50" operation="notify" operation_key="drbd0:1_post_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9"/>
-+ <rsc_op id="48" operation="notify" operation_key="drbd0:1_post_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -227,10 +227,10 @@
- <pseudo_event id="29" operation="notify" operation_key="ms-drbd0_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="47" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
-+ <rsc_op id="45" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
- </trigger>
- <trigger>
-- <rsc_op id="49" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9"/>
-+ <rsc_op id="47" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -283,7 +283,7 @@
- <pseudo_event id="25" operation="notify" operation_key="ms-drbd0_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="46" operation="notify" operation_key="drbd0:0_post_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
-+ <rsc_op id="44" operation="notify" operation_key="drbd0:0_post_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -313,7 +313,7 @@
- <pseudo_event id="23" operation="notify" operation_key="ms-drbd0_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="45" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
-+ <rsc_op id="43" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -373,7 +373,7 @@
- <pseudo_event id="19" operation="notify" operation_key="ms-drbd0_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="43" operation="notify" operation_key="drbd0:0_post_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
-+ <rsc_op id="41" operation="notify" operation_key="drbd0:0_post_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -403,10 +403,10 @@
- <pseudo_event id="17" operation="notify" operation_key="ms-drbd0_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="42" operation="notify" operation_key="drbd0:0_pre_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
-+ <rsc_op id="40" operation="notify" operation_key="drbd0:0_pre_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be"/>
- </trigger>
- <trigger>
-- <rsc_op id="44" operation="notify" operation_key="drbd0:1_pre_notify_stop_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9"/>
-+ <rsc_op id="42" operation="notify" operation_key="drbd0:1_pre_notify_stop_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/novell-252693.exp b/pengine/test10/novell-252693.exp
-index 43da979..82486d2 100644
---- a/pengine/test10/novell-252693.exp
-+++ b/pengine/test10/novell-252693.exp
-@@ -77,7 +77,7 @@
- </synapse>
- <synapse id="6" priority="1000000">
- <action_set>
-- <rsc_op id="85" operation="notify" operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
-+ <rsc_op id="83" operation="notify" operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
- <primitive id="evmsclone" long-id="evmsclone:0" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -90,7 +90,7 @@
- </synapse>
- <synapse id="7">
- <action_set>
-- <rsc_op id="84" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
-+ <rsc_op id="82" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
- <primitive id="evmsclone" long-id="evmsclone:0" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -103,7 +103,7 @@
- </synapse>
- <synapse id="8">
- <action_set>
-- <rsc_op id="86" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
-+ <rsc_op id="84" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
- <primitive id="evmsclone" long-id="evmsclone:1" class="ocf" provider="heartbeat" type="EvmsSCC"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -138,7 +138,7 @@
- <pseudo_event id="38" operation="notify" operation_key="evmscloneset_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="85" operation="notify" operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
-+ <rsc_op id="83" operation="notify" operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -168,10 +168,10 @@
- <pseudo_event id="36" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="84" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
-+ <rsc_op id="82" operation="notify" operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
- </trigger>
- <trigger>
-- <rsc_op id="86" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321"/>
-+ <rsc_op id="84" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -218,7 +218,7 @@
- </synapse>
- <synapse id="16" priority="1000000">
- <action_set>
-- <rsc_op id="90" operation="notify" operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
-+ <rsc_op id="86" operation="notify" operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
- <primitive id="imagestoreclone" long-id="imagestoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -231,7 +231,7 @@
- </synapse>
- <synapse id="17">
- <action_set>
-- <rsc_op id="89" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
-+ <rsc_op id="85" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
- <primitive id="imagestoreclone" long-id="imagestoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -244,7 +244,7 @@
- </synapse>
- <synapse id="18">
- <action_set>
-- <rsc_op id="91" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
-+ <rsc_op id="87" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
- <primitive id="imagestoreclone" long-id="imagestoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
- </rsc_op>
-@@ -279,7 +279,7 @@
- <pseudo_event id="53" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="90" operation="notify" operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
-+ <rsc_op id="86" operation="notify" operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -309,10 +309,10 @@
- <pseudo_event id="51" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="89" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
-+ <rsc_op id="85" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
- </trigger>
- <trigger>
-- <rsc_op id="91" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321"/>
-+ <rsc_op id="87" operation="notify" operation_key="imagestoreclone:0_pre_notify_stop_0" internal_operation_key="imagestoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -353,7 +353,7 @@
- </synapse>
- <synapse id="26" priority="1000000">
- <action_set>
-- <rsc_op id="95" operation="notify" operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
-+ <rsc_op id="89" operation="notify" operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
- <primitive id="configstoreclone" long-id="configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -366,7 +366,7 @@
- </synapse>
- <synapse id="27">
- <action_set>
-- <rsc_op id="94" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
-+ <rsc_op id="88" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e">
- <primitive id="configstoreclone" long-id="configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -379,7 +379,7 @@
- </synapse>
- <synapse id="28">
- <action_set>
-- <rsc_op id="96" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
-+ <rsc_op id="90" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
- <primitive id="configstoreclone" long-id="configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node2 node1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321" CRM_meta_timeout="20000" device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -414,7 +414,7 @@
- <pseudo_event id="68" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="95" operation="notify" operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
-+ <rsc_op id="89" operation="notify" operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -444,10 +444,10 @@
- <pseudo_event id="66" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="94" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
-+ <rsc_op id="88" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="997c3f45-7e3f-4c70-8d9a-623ba1678a6e"/>
- </trigger>
- <trigger>
-- <rsc_op id="96" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321"/>
-+ <rsc_op id="90" operation="notify" operation_key="configstoreclone:0_pre_notify_stop_0" internal_operation_key="configstoreclone:1_pre_notify_stop_0" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/one-or-more-unrunnable-instances.exp b/pengine/test10/one-or-more-unrunnable-instances.exp
-index 45ae3b6..ff156a4 100644
---- a/pengine/test10/one-or-more-unrunnable-instances.exp
-+++ b/pengine/test10/one-or-more-unrunnable-instances.exp
-@@ -4300,7 +4300,7 @@
- </synapse>
- <synapse id="293" priority="1000000">
- <action_set>
-- <rsc_op id="777" operation="notify" operation_key="nova-compute_post_notify_start_0" internal_operation_key="nova-compute:0_post_notify_start_0" on_node="mrg-07" on_node_uuid="mrg-07" router_node="rdo7-node1">
-+ <rsc_op id="759" operation="notify" operation_key="nova-compute_post_notify_start_0" internal_operation_key="nova-compute:0_post_notify_start_0" on_node="mrg-07" on_node_uuid="mrg-07" router_node="rdo7-node1">
- <primitive id="nova-compute" long-id="nova-compute:0" class="ocf" provider="openstack" type="NovaCompute"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mrg-07 mrg-08 mrg-09 rdo7-node1 rdo7-node2 rdo7-node3" CRM_meta_notify_available_uname="mrg-09 mrg-08 mrg-07" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="nova-compute:0 nova-compute:1 nova-compute:2 nova-compute:3 nova-compute:4 nova-compute:5" 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="nova-compute:0 nova-compute:1 nova-compute:2" CRM_meta_notify_start_uname="mrg-07 mrg-08 mrg-09" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="mrg-07" CRM_meta_on_node_uuid="mrg-07" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -4345,7 +4345,7 @@
- </synapse>
- <synapse id="296" priority="1000000">
- <action_set>
-- <rsc_op id="778" operation="notify" operation_key="nova-compute:1_post_notify_start_0" on_node="mrg-08" on_node_uuid="mrg-08" router_node="rdo7-node2">
-+ <rsc_op id="760" operation="notify" operation_key="nova-compute:1_post_notify_start_0" on_node="mrg-08" on_node_uuid="mrg-08" router_node="rdo7-node2">
- <primitive id="nova-compute" long-id="nova-compute:1" class="ocf" provider="openstack" type="NovaCompute"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mrg-07 mrg-08 mrg-09 rdo7-node1 rdo7-node2 rdo7-node3" CRM_meta_notify_available_uname="mrg-09 mrg-08 mrg-07" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="nova-compute:0 nova-compute:1 nova-compute:2 nova-compute:3 nova-compute:4 nova-compute:5" 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="nova-compute:0 nova-compute:1 nova-compute:2" CRM_meta_notify_start_uname="mrg-07 mrg-08 mrg-09" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="mrg-08" CRM_meta_on_node_uuid="mrg-08" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -4390,7 +4390,7 @@
- </synapse>
- <synapse id="299" priority="1000000">
- <action_set>
-- <rsc_op id="779" operation="notify" operation_key="nova-compute:2_post_notify_start_0" on_node="mrg-09" on_node_uuid="mrg-09" router_node="rdo7-node3">
-+ <rsc_op id="761" operation="notify" operation_key="nova-compute:2_post_notify_start_0" on_node="mrg-09" on_node_uuid="mrg-09" router_node="rdo7-node3">
- <primitive id="nova-compute" long-id="nova-compute:2" class="ocf" provider="openstack" type="NovaCompute"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mrg-07 mrg-08 mrg-09 rdo7-node1 rdo7-node2 rdo7-node3" CRM_meta_notify_available_uname="mrg-09 mrg-08 mrg-07" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="nova-compute:0 nova-compute:1 nova-compute:2 nova-compute:3 nova-compute:4 nova-compute:5" 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="nova-compute:0 nova-compute:1 nova-compute:2" CRM_meta_notify_start_uname="mrg-07 mrg-08 mrg-09" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="mrg-09" CRM_meta_on_node_uuid="mrg-09" CRM_meta_timeout="20000" />
- </rsc_op>
-@@ -4444,13 +4444,13 @@
- <pseudo_event id="585" operation="notify" operation_key="nova-compute-clone_post_notify_running_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="777" operation="notify" operation_key="nova-compute_post_notify_start_0" internal_operation_key="nova-compute:0_post_notify_start_0" on_node="mrg-07" on_node_uuid="mrg-07" router_node="rdo7-node1"/>
-+ <rsc_op id="759" operation="notify" operation_key="nova-compute_post_notify_start_0" internal_operation_key="nova-compute:0_post_notify_start_0" on_node="mrg-07" on_node_uuid="mrg-07" router_node="rdo7-node1"/>
- </trigger>
- <trigger>
-- <rsc_op id="778" operation="notify" operation_key="nova-compute:1_post_notify_start_0" on_node="mrg-08" on_node_uuid="mrg-08" router_node="rdo7-node2"/>
-+ <rsc_op id="760" operation="notify" operation_key="nova-compute:1_post_notify_start_0" on_node="mrg-08" on_node_uuid="mrg-08" router_node="rdo7-node2"/>
- </trigger>
- <trigger>
-- <rsc_op id="779" operation="notify" operation_key="nova-compute:2_post_notify_start_0" on_node="mrg-09" on_node_uuid="mrg-09" router_node="rdo7-node3"/>
-+ <rsc_op id="761" operation="notify" operation_key="nova-compute:2_post_notify_start_0" on_node="mrg-09" on_node_uuid="mrg-09" router_node="rdo7-node3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/order_constraint_stops_master.dot b/pengine/test10/order_constraint_stops_master.dot
-index b2ebc9f..359d3fe 100644
---- a/pengine/test10/order_constraint_stops_master.dot
-+++ b/pengine/test10/order_constraint_stops_master.dot
-@@ -3,7 +3,6 @@
- "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold]
- "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
- "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
--"MASTER_RSC_A_confirmed-post_notify_running_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
- "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
- "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder2" [ style = bold]
-diff --git a/pengine/test10/order_constraint_stops_master.exp b/pengine/test10/order_constraint_stops_master.exp
-index 551e186..22355bc 100644
---- a/pengine/test10/order_constraint_stops_master.exp
-+++ b/pengine/test10/order_constraint_stops_master.exp
-@@ -3,7 +3,7 @@
- <action_set>
- <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
-+ <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -16,7 +16,7 @@
- <action_set>
- <rsc_op id="39" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
-+ <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -29,7 +29,7 @@
- <action_set>
- <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
-+ <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -42,7 +42,7 @@
- <action_set>
- <rsc_op id="6" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="100000" />
-+ <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="100000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -58,7 +58,7 @@
- <action_set>
- <rsc_op id="5" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
-+ <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="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" 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=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
- <inputs>
-diff --git a/pengine/test10/order_constraint_stops_slave.dot b/pengine/test10/order_constraint_stops_slave.dot
-index 90e1311..b7a48eb 100644
---- a/pengine/test10/order_constraint_stops_slave.dot
-+++ b/pengine/test10/order_constraint_stops_slave.dot
-@@ -1,5 +1,4 @@
- digraph "g" {
--"MASTER_RSC_A_confirmed-post_notify_running_0" -> "NATIVE_RSC_A:0_monitor_30000 fc16-builder" [ style = dashed]
- "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
- "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
- "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder" [ style = bold]
-diff --git a/pengine/test10/order_constraint_stops_slave.exp b/pengine/test10/order_constraint_stops_slave.exp
-index 1a7d5da..96c7a72 100644
---- a/pengine/test10/order_constraint_stops_slave.exp
-+++ b/pengine/test10/order_constraint_stops_slave.exp
-@@ -3,7 +3,7 @@
- <action_set>
- <rsc_op id="33" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
-+ <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="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
- <inputs>
-@@ -16,7 +16,7 @@
- <action_set>
- <rsc_op id="4" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
- <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-- <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="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" 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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="100000" />
-+ <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="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" 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=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="100000" />
- </rsc_op>
- </action_set>
- <inputs>
-diff --git a/pengine/test10/probe-0.exp b/pengine/test10/probe-0.exp
-index fe866a4..d65acb6 100644
---- a/pengine/test10/probe-0.exp
-+++ b/pengine/test10/probe-0.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="53" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
-+ <rsc_op id="49" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
- <primitive id="configstoreclone" long-id="configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="x32c47 x32c48" CRM_meta_notify_available_uname="x32c48 x32c47" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_start_uname="x32c47 x32c48" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="x32c47" CRM_meta_on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410" CRM_meta_timeout="20000" device="/dev/sdb2" directory="/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -36,7 +36,7 @@
- </synapse>
- <synapse id="3" priority="1000000">
- <action_set>
-- <rsc_op id="54" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
-+ <rsc_op id="50" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
- <primitive id="configstoreclone" long-id="configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="x32c47 x32c48" CRM_meta_notify_available_uname="x32c48 x32c47" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_start_uname="x32c47 x32c48" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="x32c48" CRM_meta_on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872" CRM_meta_timeout="20000" device="/dev/sdb2" directory="/vm" fstype="ocfs2"/>
- </rsc_op>
-@@ -80,10 +80,10 @@
- <pseudo_event id="36" operation="notify" operation_key="configstorecloneset_post_notify_running_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="53" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
-+ <rsc_op id="49" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
- </trigger>
- <trigger>
-- <rsc_op id="54" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
-+ <rsc_op id="50" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/probe-2.exp b/pengine/test10/probe-2.exp
-index e8fbcff..72cc32a 100644
---- a/pengine/test10/probe-2.exp
-+++ b/pengine/test10/probe-2.exp
-@@ -1,7 +1,7 @@
- <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
- <synapse id="0" priority="1000000">
- <action_set>
-- <rsc_op id="197" operation="notify" operation_key="drbd_mysql:0_post_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="195" operation="notify" operation_key="drbd_mysql:0_post_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_mysql" long-id="drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -14,7 +14,7 @@
- </synapse>
- <synapse id="1">
- <action_set>
-- <rsc_op id="196" operation="notify" operation_key="drbd_mysql:0_pre_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="194" operation="notify" operation_key="drbd_mysql:0_pre_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_mysql" long-id="drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -27,7 +27,7 @@
- </synapse>
- <synapse id="2" priority="1000000">
- <action_set>
-- <rsc_op id="195" operation="notify" operation_key="drbd_mysql:0_post_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="193" operation="notify" operation_key="drbd_mysql:0_post_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_mysql" long-id="drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -40,7 +40,7 @@
- </synapse>
- <synapse id="3">
- <action_set>
-- <rsc_op id="194" operation="notify" operation_key="drbd_mysql:0_pre_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="192" operation="notify" operation_key="drbd_mysql:0_pre_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_mysql" long-id="drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -53,7 +53,7 @@
- </synapse>
- <synapse id="4" priority="1000000">
- <action_set>
-- <rsc_op id="192" operation="notify" operation_key="drbd_mysql:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="190" operation="notify" operation_key="drbd_mysql:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_mysql" long-id="drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -66,7 +66,7 @@
- </synapse>
- <synapse id="5">
- <action_set>
-- <rsc_op id="191" operation="notify" operation_key="drbd_mysql:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="189" operation="notify" operation_key="drbd_mysql:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_mysql" long-id="drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -126,7 +126,7 @@
- </synapse>
- <synapse id="9" priority="1000000">
- <action_set>
-- <rsc_op id="199" operation="notify" operation_key="drbd_mysql:1_post_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
-+ <rsc_op id="197" operation="notify" operation_key="drbd_mysql:1_post_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
- <primitive id="drbd_mysql" long-id="drbd_mysql:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_on_node="wc02" CRM_meta_on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -139,7 +139,7 @@
- </synapse>
- <synapse id="10">
- <action_set>
-- <rsc_op id="198" operation="notify" operation_key="drbd_mysql:1_pre_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
-+ <rsc_op id="196" operation="notify" operation_key="drbd_mysql:1_pre_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
- <primitive id="drbd_mysql" long-id="drbd_mysql:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc02" CRM_meta_on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -152,7 +152,7 @@
- </synapse>
- <synapse id="11">
- <action_set>
-- <rsc_op id="193" operation="notify" operation_key="drbd_mysql:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
-+ <rsc_op id="191" operation="notify" operation_key="drbd_mysql:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
- <primitive id="drbd_mysql" long-id="drbd_mysql:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc02" CRM_meta_on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="mysql"/>
- </rsc_op>
-@@ -203,10 +203,10 @@
- <pseudo_event id="60" operation="notify" operation_key="ms_drbd_mysql_post_notify_demoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="197" operation="notify" operation_key="drbd_mysql:0_post_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="195" operation="notify" operation_key="drbd_mysql:0_post_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- <trigger>
-- <rsc_op id="199" operation="notify" operation_key="drbd_mysql:1_post_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
-+ <rsc_op id="197" operation="notify" operation_key="drbd_mysql:1_post_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -236,10 +236,10 @@
- <pseudo_event id="58" operation="notify" operation_key="ms_drbd_mysql_pre_notify_demote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="196" operation="notify" operation_key="drbd_mysql:0_pre_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="194" operation="notify" operation_key="drbd_mysql:0_pre_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- <trigger>
-- <rsc_op id="198" operation="notify" operation_key="drbd_mysql:1_pre_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
-+ <rsc_op id="196" operation="notify" operation_key="drbd_mysql:1_pre_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -292,7 +292,7 @@
- <pseudo_event id="54" operation="notify" operation_key="ms_drbd_mysql_post_notify_promoted_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="195" operation="notify" operation_key="drbd_mysql:0_post_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="193" operation="notify" operation_key="drbd_mysql:0_post_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -322,7 +322,7 @@
- <pseudo_event id="52" operation="notify" operation_key="ms_drbd_mysql_pre_notify_promote_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="194" operation="notify" operation_key="drbd_mysql:0_pre_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="192" operation="notify" operation_key="drbd_mysql:0_pre_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -382,7 +382,7 @@
- <pseudo_event id="48" operation="notify" operation_key="ms_drbd_mysql_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="192" operation="notify" operation_key="drbd_mysql:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="190" operation="notify" operation_key="drbd_mysql:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -412,10 +412,10 @@
- <pseudo_event id="46" operation="notify" operation_key="ms_drbd_mysql_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="191" operation="notify" operation_key="drbd_mysql:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="189" operation="notify" operation_key="drbd_mysql:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- <trigger>
-- <rsc_op id="193" operation="notify" operation_key="drbd_mysql:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
-+ <rsc_op id="191" operation="notify" operation_key="drbd_mysql:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -666,7 +666,7 @@
- </synapse>
- <synapse id="45" priority="1000000">
- <action_set>
-- <rsc_op id="203" operation="notify" operation_key="drbd_www:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="199" operation="notify" operation_key="drbd_www:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_www" long-id="drbd_www:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="www"/>
- </rsc_op>
-@@ -679,7 +679,7 @@
- </synapse>
- <synapse id="46">
- <action_set>
-- <rsc_op id="202" operation="notify" operation_key="drbd_www:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
-+ <rsc_op id="198" operation="notify" operation_key="drbd_www:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
- <primitive id="drbd_www" long-id="drbd_www:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="www"/>
- </rsc_op>
-@@ -692,7 +692,7 @@
- </synapse>
- <synapse id="47">
- <action_set>
-- <rsc_op id="204" operation="notify" operation_key="drbd_www:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
-+ <rsc_op id="200" operation="notify" operation_key="drbd_www:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
- <primitive id="drbd_www" long-id="drbd_www:1" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" 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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_on_node="wc02" CRM_meta_on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" CRM_meta_timeout="20000" clone-overrides-hostname="no" drbd_resource="www"/>
- </rsc_op>
-@@ -727,7 +727,7 @@
- <pseudo_event id="90" operation="notify" operation_key="ms_drbd_www_post_notify_stopped_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="203" operation="notify" operation_key="drbd_www:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="199" operation="notify" operation_key="drbd_www:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- </inputs>
- </synapse>
-@@ -757,10 +757,10 @@
- <pseudo_event id="88" operation="notify" operation_key="ms_drbd_www_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="202" operation="notify" operation_key="drbd_www:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
-+ <rsc_op id="198" operation="notify" operation_key="drbd_www:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
- </trigger>
- <trigger>
-- <rsc_op id="204" operation="notify" operation_key="drbd_www:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
-+ <rsc_op id="200" operation="notify" operation_key="drbd_www:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-recover-all.exp b/pengine/test10/remote-recover-all.exp
-index 556ccfd..fd2cf82 100644
---- a/pengine/test10/remote-recover-all.exp
-+++ b/pengine/test10/remote-recover-all.exp
-@@ -310,7 +310,7 @@
- </synapse>
- <synapse id="22">
- <action_set>
-- <rsc_op id="197" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
-+ <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -339,7 +339,7 @@
- </synapse>
- <synapse id="24">
- <action_set>
-- <rsc_op id="198" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
-+ <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -410,10 +410,10 @@
- <pseudo_event id="78" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="197" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
-+ <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="198" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
-+ <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-recover-connection.exp b/pengine/test10/remote-recover-connection.exp
-index 40338b4..a9dd475 100644
---- a/pengine/test10/remote-recover-connection.exp
-+++ b/pengine/test10/remote-recover-connection.exp
-@@ -187,7 +187,7 @@
- </synapse>
- <synapse id="15">
- <action_set>
-- <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
-+ <rsc_op id="189" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -216,7 +216,7 @@
- </synapse>
- <synapse id="17">
- <action_set>
-- <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
-+ <rsc_op id="190" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -287,10 +287,10 @@
- <pseudo_event id="85" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
-+ <rsc_op id="189" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
-+ <rsc_op id="190" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-recover-no-resources.exp b/pengine/test10/remote-recover-no-resources.exp
-index 0a57e27..09b012b 100644
---- a/pengine/test10/remote-recover-no-resources.exp
-+++ b/pengine/test10/remote-recover-no-resources.exp
-@@ -221,7 +221,7 @@
- </synapse>
- <synapse id="16">
- <action_set>
-- <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
-+ <rsc_op id="189" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -250,7 +250,7 @@
- </synapse>
- <synapse id="18">
- <action_set>
-- <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
-+ <rsc_op id="190" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -321,10 +321,10 @@
- <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
-+ <rsc_op id="189" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
-+ <rsc_op id="190" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-recover-unknown.exp b/pengine/test10/remote-recover-unknown.exp
-index 0d7b318..0a1d170 100644
---- a/pengine/test10/remote-recover-unknown.exp
-+++ b/pengine/test10/remote-recover-unknown.exp
-@@ -221,7 +221,7 @@
- </synapse>
- <synapse id="16">
- <action_set>
-- <rsc_op id="196" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
-+ <rsc_op id="192" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -250,7 +250,7 @@
- </synapse>
- <synapse id="18">
- <action_set>
-- <rsc_op id="197" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
-+ <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -321,10 +321,10 @@
- <pseudo_event id="76" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="196" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
-+ <rsc_op id="192" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="197" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
-+ <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
-diff --git a/pengine/test10/remote-recovery.exp b/pengine/test10/remote-recovery.exp
-index 40338b4..a9dd475 100644
---- a/pengine/test10/remote-recovery.exp
-+++ b/pengine/test10/remote-recovery.exp
-@@ -187,7 +187,7 @@
- </synapse>
- <synapse id="15">
- <action_set>
-- <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
-+ <rsc_op id="189" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
- <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -216,7 +216,7 @@
- </synapse>
- <synapse id="17">
- <action_set>
-- <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
-+ <rsc_op id="190" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
- <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
- <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" 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="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_notify_type="pre" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" wait_last_known_master="true"/>
- </rsc_op>
-@@ -287,10 +287,10 @@
- <pseudo_event id="85" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
- </trigger>
- <trigger>
-- <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
-+ <rsc_op id="189" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1"/>
- </trigger>
- <trigger>
-- <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
-+ <rsc_op id="190" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3"/>
- </trigger>
- </inputs>
- </synapse>
---
-1.8.3.1
-
diff --git a/SOURCES/014-segfault.patch b/SOURCES/014-segfault.patch
deleted file mode 100644
index 2718f82..0000000
--- a/SOURCES/014-segfault.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b2ab0f457e4fc594d98379abf2bd92ddc0bc018c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
-Date: Tue, 3 Apr 2018 23:53:44 +0200
-Subject: [PATCH] High: pengine: fix swapped warning message arguments leading
- to segfault
-
-...when triggered. Present since 9cf01f5f9 (or since 1.1.17).
----
- lib/pengine/failcounts.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/pengine/failcounts.c b/lib/pengine/failcounts.c
-index 53c0f14..e217176 100644
---- a/lib/pengine/failcounts.c
-+++ b/lib/pengine/failcounts.c
-@@ -268,7 +268,7 @@ pe_get_failcount(node_t *node, resource_t *rsc, time_t *last_failure,
- && block_failure(node, rsc, xml_op, data_set)) {
-
- pe_warn("Ignoring failure timeout %d for %s because it conflicts with on-fail=block",
-- rsc->id, rsc->failure_timeout);
-+ rsc->failure_timeout, rsc->id);
- rsc->failure_timeout = 0;
- }
-
---
-1.8.3.1
-
diff --git a/SOURCES/015-fail-timeout.patch b/SOURCES/015-fail-timeout.patch
deleted file mode 100644
index 02148fd..0000000
--- a/SOURCES/015-fail-timeout.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 74171d10462e11e46c67c3aabbbc4e1185a334d4 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Wed, 11 Apr 2018 11:48:13 +1000
-Subject: [PATCH] Fix: rhbz#1565187 - Ensure failures that cause fencing are
- not removed until after fencing completes
-
----
- lib/pengine/unpack.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
-index 355cdcf..3a4a7cc 100644
---- a/lib/pengine/unpack.c
-+++ b/lib/pengine/unpack.c
-@@ -2949,6 +2949,7 @@ static bool check_operation_expiry(resource_t *rsc, node_t *node, int rc, xmlNod
- }
-
- if (clear_reason != NULL) {
-+ node_t *remote_node = pe_find_node(data_set->nodes, rsc->id);
- char *key = generate_op_key(rsc->id, CRM_OP_CLEAR_FAILCOUNT, 0);
- action_t *clear_op = custom_action(rsc, key, CRM_OP_CLEAR_FAILCOUNT,
- node, FALSE, TRUE, data_set);
-@@ -2957,6 +2958,17 @@ static bool check_operation_expiry(resource_t *rsc, node_t *node, int rc, xmlNod
-
- crm_notice("Clearing failure of %s on %s because %s " CRM_XS " %s",
- rsc->id, node->details->uname, clear_reason, clear_op->uuid);
-+
-+ if (is_set(data_set->flags, pe_flag_stonith_enabled)
-+ && rsc->remote_reconnect_interval
-+ && remote_node
-+ && remote_node->details->unclean) {
-+
-+ action_t *fence = pe_fence_op(remote_node, NULL, TRUE, NULL, data_set);
-+ crm_notice("Waiting for %s to complete before clearing %s failure for remote node %s", fence?fence->uuid:"nil", task, rsc->id);
-+
-+ order_actions(fence, clear_op, pe_order_implies_then);
-+ }
- }
-
- crm_element_value_int(xml_op, XML_LRM_ATTR_INTERVAL, &interval);
---
-1.8.3.1
-
diff --git a/SOURCES/016-crm_diff.patch b/SOURCES/016-crm_diff.patch
deleted file mode 100644
index dce31a2..0000000
--- a/SOURCES/016-crm_diff.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From a5c0782c0012b812ad0939a4aec5842f05dc1129 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Sun, 15 Apr 2018 20:41:01 +1000
-Subject: [PATCH] Fix: crm_diff: rhbz#1561617 - Ignore attribute placement when
- comparing in 'cib' mode
-
----
- include/crm/common/xml.h | 1 +
- lib/common/xml.c | 28 ++++++++++++++++++++++++----
- tools/crm_diff.c | 6 +++++-
- 3 files changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/include/crm/common/xml.h b/include/crm/common/xml.h
-index 8297bb2..69ad4bd 100644
---- a/include/crm/common/xml.h
-+++ b/include/crm/common/xml.h
-@@ -380,6 +380,7 @@ bool xml_tracking_changes(xmlNode * xml);
- bool xml_document_dirty(xmlNode *xml);
- void xml_track_changes(xmlNode * xml, const char *user, xmlNode *acl_source, bool enforce_acls);
- void xml_calculate_changes(xmlNode * old, xmlNode * new); /* For comparing two documents after the fact */
-+void xml_calculate_significant_changes(xmlNode *old_xml, xmlNode *new_xml);
- void xml_accept_changes(xmlNode * xml);
- void xml_log_changes(uint8_t level, const char *function, xmlNode *xml);
- void xml_log_patchset(uint8_t level, const char *function, xmlNode *xml);
-diff --git a/lib/common/xml.c b/lib/common/xml.c
-index 947ddfe..8fd4778 100644
---- a/lib/common/xml.c
-+++ b/lib/common/xml.c
-@@ -72,6 +72,7 @@ enum xml_private_flags {
-
- xpf_acl_create = 0x1000,
- xpf_acl_denied = 0x2000,
-+ xpf_lazy = 0x4000,
- };
-
- typedef struct xml_private_s
-@@ -115,10 +116,22 @@ static inline bool TRACKING_CHANGES(xmlNode *xml)
- {
- if(xml == NULL || xml->doc == NULL || xml->doc->_private == NULL) {
- return FALSE;
-- } else if(is_set(((xml_private_t *)xml->doc->_private)->flags, xpf_tracking)) {
-- return TRUE;
-+ } else if(is_not_set(((xml_private_t *)xml->doc->_private)->flags, xpf_tracking)) {
-+ return FALSE;
- }
-- return FALSE;
-+ return TRUE;
-+}
-+
-+static inline bool TRACKING_CHANGES_LAZY(xmlNode *xml)
-+{
-+ if(xml == NULL || xml->doc == NULL || xml->doc->_private == NULL) {
-+ return FALSE;
-+ } else if(is_not_set(((xml_private_t *)xml->doc->_private)->flags, xpf_tracking)) {
-+ return FALSE;
-+ } else if(is_not_set(((xml_private_t *)xml->doc->_private)->flags, xpf_lazy)) {
-+ return FALSE;
-+ }
-+ return TRUE;
- }
-
- #define buffer_print(buffer, max, offset, fmt, args...) do { \
-@@ -4084,7 +4097,7 @@ __xml_diff_object(xmlNode * old, xmlNode * new)
- crm_xml_add(new, name, vcopy);
- free(vcopy);
-
-- } else if(p_old != p_new) {
-+ } else if(p_old != p_new && TRACKING_CHANGES_LAZY(new) == FALSE) {
- crm_info("Moved %s@%s (%d -> %d)", old->name, name, p_old, p_new);
- __xml_node_dirty(new);
- p->flags |= xpf_dirty|xpf_moved;
-@@ -4184,6 +4197,13 @@ __xml_diff_object(xmlNode * old, xmlNode * new)
- }
-
- void
-+xml_calculate_significant_changes(xmlNode *old_xml, xmlNode *new_xml)
-+{
-+ set_doc_flag(new_xml, xpf_lazy);
-+ xml_calculate_changes(old_xml, new_xml);
-+}
-+
-+void
- xml_calculate_changes(xmlNode * old, xmlNode * new)
- {
- CRM_CHECK(safe_str_eq(crm_element_name(old), crm_element_name(new)), return);
-diff --git a/tools/crm_diff.c b/tools/crm_diff.c
-index 20e7a27..0ec8e44 100644
---- a/tools/crm_diff.c
-+++ b/tools/crm_diff.c
-@@ -190,7 +190,11 @@ generate_patch(xmlNode *object_1, xmlNode *object_2, const char *xml_file_2,
- }
-
- xml_track_changes(object_2, NULL, object_2, FALSE);
-- xml_calculate_changes(object_1, object_2);
-+ if(as_cib) {
-+ xml_calculate_significant_changes(object_1, object_2);
-+ } else {
-+ xml_calculate_changes(object_1, object_2);
-+ }
- crm_log_xml_debug(object_2, (xml_file_2? xml_file_2: "target"));
-
- output = xml_create_patchset(0, object_1, object_2, NULL, FALSE);
---
-1.8.3.1
-
diff --git a/SOURCES/017-pending-notify.patch b/SOURCES/017-pending-notify.patch
deleted file mode 100644
index e667ca9..0000000
--- a/SOURCES/017-pending-notify.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8e9a9d1aa3cceb8f310ed3db9b31b2eab9490330 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Thu, 19 Apr 2018 17:17:51 -0500
-Subject: [PATCH] Fix: libcrmcommon: don't record pending notify actions as
- completed
-
-... especially relevant now that record-pending defaults to true.
----
- lib/common/operations.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/lib/common/operations.c b/lib/common/operations.c
-index 4afef80..3ca5939 100644
---- a/lib/common/operations.c
-+++ b/lib/common/operations.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2004-2017 Andrew Beekhof <andrew@beekhof.net>
-+ * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>
- *
- * This source code is licensed under the GNU Lesser General Public License
- * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
-@@ -513,9 +513,15 @@ create_operation_update(xmlNode * parent, lrmd_event_data_t * op, const char * c
- CRM_LOG_ASSERT(n_task != NULL);
- op_id = generate_notify_key(op->rsc_id, n_type, n_task);
-
-- /* these are not yet allowed to fail */
-- op->op_status = PCMK_LRM_OP_DONE;
-- op->rc = 0;
-+ if (op->op_status != PCMK_LRM_OP_PENDING) {
-+ /* Ignore notify errors.
-+ *
-+ * @TODO We really should keep the actual result here, and ignore it
-+ * when processing the CIB diff.
-+ */
-+ op->op_status = PCMK_LRM_OP_DONE;
-+ op->rc = 0;
-+ }
-
- } else if (did_rsc_op_fail(op, target_rc)) {
- op_id = generate_op_key(op->rsc_id, "last_failure", 0);
---
-1.8.3.1
-
diff --git a/SOURCES/018-node-names.patch b/SOURCES/018-node-names.patch
deleted file mode 100644
index f8b8dfb..0000000
--- a/SOURCES/018-node-names.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7618c29761368262fd8d633992816b52755ec028 Mon Sep 17 00:00:00 2001
-From: Hideo Yamauchi <renayama19661014@ybb.ne.jp>
-Date: Thu, 26 Apr 2018 12:51:06 +0900
-Subject: [PATCH] Mid: lib: Changed to lowercase comparison.
-
----
- lib/cib/cib_attrs.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/lib/cib/cib_attrs.c b/lib/cib/cib_attrs.c
-index 8287a44..060d830 100644
---- a/lib/cib/cib_attrs.c
-+++ b/lib/cib/cib_attrs.c
-@@ -471,17 +471,19 @@ get_uuid_from_result(xmlNode *result, char **uuid, int *is_remote)
- * - guest node in resources section
- * - orphaned remote node or bundle guest node in status section
- */
-+#define XPATH_UPPER_TRANS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+#define XPATH_LOWER_TRANS "abcdefghijklmnopqrstuvwxyz"
- #define XPATH_NODE \
- "/" XML_TAG_CIB "/" XML_CIB_TAG_CONFIGURATION "/" XML_CIB_TAG_NODES \
-- "/" XML_CIB_TAG_NODE "[@" XML_ATTR_UNAME "='%s']" \
-+ "/" XML_CIB_TAG_NODE "[translate(@" XML_ATTR_UNAME ",'" XPATH_UPPER_TRANS "','" XPATH_LOWER_TRANS "') ='%s']" \
- "|/" XML_TAG_CIB "/" XML_CIB_TAG_CONFIGURATION "/" XML_CIB_TAG_RESOURCES \
- "/" XML_CIB_TAG_RESOURCE \
-- "[@class='ocf'][@provider='pacemaker'][@type='remote'][@id='%s']" \
-+ "[@class='ocf'][@provider='pacemaker'][@type='remote'][translate(@id,'" XPATH_UPPER_TRANS "','" XPATH_LOWER_TRANS "') ='%s']" \
- "|/" XML_TAG_CIB "/" XML_CIB_TAG_CONFIGURATION "/" XML_CIB_TAG_RESOURCES \
- "/" XML_CIB_TAG_RESOURCE "/" XML_TAG_META_SETS "/" XML_CIB_TAG_NVPAIR \
-- "[@name='" XML_RSC_ATTR_REMOTE_NODE "'][@value='%s']" \
-+ "[@name='" XML_RSC_ATTR_REMOTE_NODE "'][translate(@value,'" XPATH_UPPER_TRANS "','" XPATH_LOWER_TRANS "') ='%s']" \
- "|/" XML_TAG_CIB "/" XML_CIB_TAG_STATUS "/" XML_CIB_TAG_STATE \
-- "[@" XML_NODE_IS_REMOTE "='true'][@" XML_ATTR_UUID "='%s']"
-+ "[@" XML_NODE_IS_REMOTE "='true'][translate(@" XML_ATTR_UUID ",'" XPATH_UPPER_TRANS "','" XPATH_LOWER_TRANS "') ='%s']"
-
- int
- query_node_uuid(cib_t * the_cib, const char *uname, char **uuid, int *is_remote_node)
-@@ -489,6 +491,7 @@ query_node_uuid(cib_t * the_cib, const char *uname, char **uuid, int *is_remote_
- int rc = pcmk_ok;
- char *xpath_string;
- xmlNode *xml_search = NULL;
-+ char *host_lowercase = g_ascii_strdown(uname, -1);
-
- CRM_ASSERT(uname != NULL);
-
-@@ -499,7 +502,7 @@ query_node_uuid(cib_t * the_cib, const char *uname, char **uuid, int *is_remote_
- *is_remote_node = FALSE;
- }
-
-- xpath_string = crm_strdup_printf(XPATH_NODE, uname, uname, uname, uname);
-+ xpath_string = crm_strdup_printf(XPATH_NODE, host_lowercase, host_lowercase, host_lowercase, host_lowercase);
- if (cib_internal_op(the_cib, CIB_OP_QUERY, NULL, xpath_string, NULL,
- &xml_search, cib_sync_call|cib_scope_local|cib_xpath,
- NULL) == pcmk_ok) {
-@@ -509,6 +512,7 @@ query_node_uuid(cib_t * the_cib, const char *uname, char **uuid, int *is_remote_
- }
- free(xpath_string);
- free_xml(xml_search);
-+ free(host_lowercase);
-
- if (rc != pcmk_ok) {
- crm_debug("Could not map node name '%s' to a UUID: %s",
---
-1.8.3.1
-
diff --git a/SOURCES/019-requires-quorum.patch b/SOURCES/019-requires-quorum.patch
deleted file mode 100644
index c190b4e..0000000
--- a/SOURCES/019-requires-quorum.patch
+++ /dev/null
@@ -1,660 +0,0 @@
-From 85a3a174e1fc4cd4b055eb22827c1c3d0b288a85 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Tue, 22 May 2018 11:00:22 -0500
-Subject: [PATCH 1/3] Low: libpe_status: handle pending migrations correctly
-
-This is mainly a refactor of unpack_rsc_migration() for readability.
-
-The one significant change is that previously, a migrate_from operation that
-was *recorded* as pending (record-pending=true) was treated differently from an
-unrecorded pending migrate_from (record-pending=false).
----
- include/crm/pengine/status.h | 3 +
- lib/pengine/unpack.c | 162 ++++++++++++++++++++++++-------------------
- 2 files changed, 94 insertions(+), 71 deletions(-)
-
-diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
-index fca7f12..a8c90e2 100644
---- a/include/crm/pengine/status.h
-+++ b/include/crm/pengine/status.h
-@@ -30,6 +30,9 @@ typedef struct pe_action_s pe_action_t;
- typedef struct resource_s resource_t;
- typedef struct ticket_s ticket_t;
-
-+// forward-compatible with Pacemaker 2.0.0
-+typedef struct resource_s pe_resource_t;
-+
- typedef enum no_quorum_policy_e {
- no_quorum_freeze,
- no_quorum_stop,
-diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
-index 1b8ca22..73bbe27 100644
---- a/lib/pengine/unpack.c
-+++ b/lib/pengine/unpack.c
-@@ -2414,94 +2414,114 @@ find_lrm_op(const char *resource, const char *op, const char *node, const char *
- return get_xpath_object(xpath, data_set->input, LOG_DEBUG);
- }
-
-+static bool
-+stop_happened_after(pe_resource_t *rsc, pe_node_t *node, xmlNode *xml_op,
-+ pe_working_set_t *data_set)
-+{
-+ xmlNode *stop_op = find_lrm_op(rsc->id, CRMD_ACTION_STOP, node->details->id,
-+ NULL, data_set);
-+
-+ if (stop_op) {
-+ int stop_id = 0;
-+ int task_id = 0;
-+
-+ crm_element_value_int(stop_op, XML_LRM_ATTR_CALLID, &stop_id);
-+ crm_element_value_int(xml_op, XML_LRM_ATTR_CALLID, &task_id);
-+ if (stop_id > task_id) {
-+ return TRUE;
-+ }
-+ }
-+ return FALSE;
-+}
-+
- static void
- unpack_rsc_migration(resource_t *rsc, node_t *node, xmlNode *xml_op, pe_working_set_t * data_set)
- {
--
-- /*
-- * The normal sequence is (now): migrate_to(Src) -> migrate_from(Tgt) -> stop(Src)
-- *
-- * So if a migrate_to is followed by a stop, then we don't need to care what
-- * happened on the target node
-+ /* A successful migration sequence is:
-+ * migrate_to on source node
-+ * migrate_from on target node
-+ * stop on source node
- *
-- * Without the stop, we need to look for a successful migrate_from.
-- * This would also imply we're no longer running on the source
-+ * If a migrate_to is followed by a stop, the entire migration (successful
-+ * or failed) is complete, and we don't care what happened on the target.
- *
-- * Without the stop, and without a migrate_from op we make sure the resource
-- * gets stopped on both source and target (assuming the target is up)
-+ * If no migrate_from has happened, the migration is considered to be
-+ * "partial". If the migrate_from failed, make sure the resource gets
-+ * stopped on both source and target (if up).
- *
-+ * If the migrate_to and migrate_from both succeeded (which also implies the
-+ * resource is no longer running on the source), but there is no stop, the
-+ * migration is considered to be "dangling".
- */
-- int stop_id = 0;
-- int task_id = 0;
-- xmlNode *stop_op =
-- find_lrm_op(rsc->id, CRMD_ACTION_STOP, node->details->id, NULL, data_set);
--
-- if (stop_op) {
-- crm_element_value_int(stop_op, XML_LRM_ATTR_CALLID, &stop_id);
-+ int from_rc = 0;
-+ int from_status = 0;
-+ const char *migrate_source = NULL;
-+ const char *migrate_target = NULL;
-+ pe_node_t *target = NULL;
-+ pe_node_t *source = NULL;
-+ xmlNode *migrate_from = NULL;
-+
-+ if (stop_happened_after(rsc, node, xml_op, data_set)) {
-+ return;
- }
-
-- crm_element_value_int(xml_op, XML_LRM_ATTR_CALLID, &task_id);
-+ // Clones are not allowed to migrate, so role can't be master
-+ rsc->role = RSC_ROLE_STARTED;
-
-- if (stop_op == NULL || stop_id < task_id) {
-- int from_rc = 0, from_status = 0;
-- const char *migrate_source =
-- crm_element_value(xml_op, XML_LRM_ATTR_MIGRATE_SOURCE);
-- const char *migrate_target =
-- crm_element_value(xml_op, XML_LRM_ATTR_MIGRATE_TARGET);
-+ migrate_source = crm_element_value(xml_op, XML_LRM_ATTR_MIGRATE_SOURCE);
-+ migrate_target = crm_element_value(xml_op, XML_LRM_ATTR_MIGRATE_TARGET);
-
-- node_t *target = pe_find_node(data_set->nodes, migrate_target);
-- node_t *source = pe_find_node(data_set->nodes, migrate_source);
-- xmlNode *migrate_from =
-- find_lrm_op(rsc->id, CRMD_ACTION_MIGRATED, migrate_target, migrate_source,
-- data_set);
-+ target = pe_find_node(data_set->nodes, migrate_target);
-+ source = pe_find_node(data_set->nodes, migrate_source);
-
-- rsc->role = RSC_ROLE_STARTED; /* can be master? */
-- if (migrate_from) {
-- crm_element_value_int(migrate_from, XML_LRM_ATTR_RC, &from_rc);
-- crm_element_value_int(migrate_from, XML_LRM_ATTR_OPSTATUS, &from_status);
-- pe_rsc_trace(rsc, "%s op on %s exited with status=%d, rc=%d",
-- ID(migrate_from), migrate_target, from_status, from_rc);
-- }
--
-- if (migrate_from && from_rc == PCMK_OCF_OK
-- && from_status == PCMK_LRM_OP_DONE) {
-- pe_rsc_trace(rsc, "Detected dangling migration op: %s on %s", ID(xml_op),
-- migrate_source);
-+ // Check whether there was a migrate_from action
-+ migrate_from = find_lrm_op(rsc->id, CRMD_ACTION_MIGRATED, migrate_target,
-+ migrate_source, data_set);
-+ if (migrate_from) {
-+ crm_element_value_int(migrate_from, XML_LRM_ATTR_RC, &from_rc);
-+ crm_element_value_int(migrate_from, XML_LRM_ATTR_OPSTATUS, &from_status);
-+ pe_rsc_trace(rsc, "%s op on %s exited with status=%d, rc=%d",
-+ ID(migrate_from), migrate_target, from_status, from_rc);
-+ }
-
-- /* all good
-- * just need to arrange for the stop action to get sent
-- * but _without_ affecting the target somehow
-- */
-- rsc->role = RSC_ROLE_STOPPED;
-- rsc->dangling_migrations = g_list_prepend(rsc->dangling_migrations, node);
-+ if (migrate_from && from_rc == PCMK_OCF_OK
-+ && from_status == PCMK_LRM_OP_DONE) {
-+ /* The migrate_to and migrate_from both succeeded, so mark the migration
-+ * as "dangling". This will be used to schedule a stop action on the
-+ * source without affecting the target.
-+ */
-+ pe_rsc_trace(rsc, "Detected dangling migration op: %s on %s", ID(xml_op),
-+ migrate_source);
-+ rsc->role = RSC_ROLE_STOPPED;
-+ rsc->dangling_migrations = g_list_prepend(rsc->dangling_migrations, node);
-
-- } else if (migrate_from) { /* Failed */
-- if (target && target->details->online) {
-- pe_rsc_trace(rsc, "Marking active on %s %p %d", migrate_target, target,
-- target->details->online);
-- native_add_running(rsc, target, data_set);
-- }
-+ } else if (migrate_from && (from_status != PCMK_LRM_OP_PENDING)) { // Failed
-+ if (target && target->details->online) {
-+ pe_rsc_trace(rsc, "Marking active on %s %p %d", migrate_target, target,
-+ target->details->online);
-+ native_add_running(rsc, target, data_set);
-+ }
-
-- } else { /* Pending or complete but erased */
-- if (target && target->details->online) {
-- pe_rsc_trace(rsc, "Marking active on %s %p %d", migrate_target, target,
-- target->details->online);
-+ } else { // Pending, or complete but erased
-+ if (target && target->details->online) {
-+ pe_rsc_trace(rsc, "Marking active on %s %p %d", migrate_target, target,
-+ target->details->online);
-
-- native_add_running(rsc, target, data_set);
-- if (source && source->details->online) {
-- /* If we make it here we have a partial migration. The migrate_to
-- * has completed but the migrate_from on the target has not. Hold on
-- * to the target and source on the resource. Later on if we detect that
-- * the resource is still going to run on that target, we may continue
-- * the migration */
-- rsc->partial_migration_target = target;
-- rsc->partial_migration_source = source;
-- }
-- } else {
-- /* Consider it failed here - forces a restart, prevents migration */
-- set_bit(rsc->flags, pe_rsc_failed);
-- clear_bit(rsc->flags, pe_rsc_allow_migrate);
-+ native_add_running(rsc, target, data_set);
-+ if (source && source->details->online) {
-+ /* This is a partial migration: the migrate_to completed
-+ * successfully on the source, but the migrate_from has not
-+ * completed. Remember the source and target; if the newly
-+ * chosen target remains the same when we schedule actions
-+ * later, we may continue with the migration.
-+ */
-+ rsc->partial_migration_target = target;
-+ rsc->partial_migration_source = source;
- }
-+ } else {
-+ /* Consider it failed here - forces a restart, prevents migration */
-+ set_bit(rsc->flags, pe_rsc_failed);
-+ clear_bit(rsc->flags, pe_rsc_allow_migrate);
- }
- }
- }
---
-1.8.3.1
-
-
-From 37913a1dec2bda66476bddb5559817d23058be59 Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Mon, 21 May 2018 12:43:09 -0500
-Subject: [PATCH 2/3] Refactor: libpe_status: new functions for finding
- resource's active nodes
-
-Existing code often grabs rsc->running_on->data (i.e. the first node in the
-list) as the resource's current node, and often uses
-g_list_length(rsc->running_on).
-
-However, if the resource is in the middle of a partial migration, the migration
-source should be preferred as the current node. Also, if a resource has
-"requires" set to "nothing" or "quorum", a clean, online node should be
-preferred as the current node, and a caller should ignore unclean and offline
-nodes when counting in certain cases.
-
-These functions will allow those issues to be addressed in later commits.
----
- include/crm/pengine/internal.h | 34 +++++++-----
- lib/pengine/complex.c | 121 ++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 127 insertions(+), 28 deletions(-)
-
-diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h
-index e9d7582..fe8f6a1 100644
---- a/include/crm/pengine/internal.h
-+++ b/include/crm/pengine/internal.h
-@@ -1,20 +1,10 @@
- /*
-- * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
-+ * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>
- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This software is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ * This source code is licensed under the GNU Lesser General Public License
-+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
- */
-+
- #ifndef PE_INTERNAL__H
- # define PE_INTERNAL__H
- # include <string.h>
-@@ -125,6 +115,22 @@ int pe_get_failcount(node_t *node, resource_t *rsc, time_t *last_failure,
- uint32_t flags, xmlNode *xml_op,
- pe_working_set_t *data_set);
-
-+
-+/* Functions for finding/counting a resource's active nodes */
-+
-+pe_node_t *pe__find_active_on(const resource_t *rsc,
-+ unsigned int *count_all,
-+ unsigned int *count_clean);
-+pe_node_t *pe__find_active_requires(const resource_t *rsc,
-+ unsigned int *count);
-+
-+static inline pe_node_t *
-+pe__current_node(const resource_t *rsc)
-+{
-+ return pe__find_active_on(rsc, NULL, NULL);
-+}
-+
-+
- /* Binary like operators for lists of nodes */
- extern void node_list_exclude(GHashTable * list, GListPtr list2, gboolean merge_scores);
- extern GListPtr node_list_dup(GListPtr list, gboolean reset, gboolean filter);
-diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c
-index 86f290c..cdd409a 100644
---- a/lib/pengine/complex.c
-+++ b/lib/pengine/complex.c
-@@ -1,19 +1,8 @@
- /*
-- * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
-+ * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ * This source code is licensed under the GNU Lesser General Public License
-+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
- */
-
- #include <crm_internal.h>
-@@ -981,3 +970,107 @@ common_free(resource_t * rsc)
- free(rsc->pending_task);
- free(rsc);
- }
-+
-+/*!
-+ * \brief
-+ * \internal Find a node (and optionally count all) where resource is active
-+ *
-+ * \param[in] rsc Resource to check
-+ * \param[out] count_all If not NULL, will be set to count of active nodes
-+ * \param[out] count_clean If not NULL, will be set to count of clean nodes
-+ *
-+ * \return An active node (or NULL if resource is not active anywhere)
-+ *
-+ * \note The order of preference is: an active node that is the resource's
-+ * partial migration source; if the resource's "requires" is "quorum" or
-+ * "nothing", the first active node in the list that is clean and online;
-+ * the first active node in the list.
-+ */
-+pe_node_t *
-+pe__find_active_on(const resource_t *rsc, unsigned int *count_all,
-+ unsigned int *count_clean)
-+{
-+ pe_node_t *active = NULL;
-+ pe_node_t *node = NULL;
-+ bool keep_looking = FALSE;
-+ bool is_happy = FALSE;
-+
-+ if (count_all) {
-+ *count_all = 0;
-+ }
-+ if (count_clean) {
-+ *count_clean = 0;
-+ }
-+ if (rsc == NULL) {
-+ return NULL;
-+ }
-+
-+ for (GList *node_iter = rsc->running_on; node_iter != NULL;
-+ node_iter = node_iter->next) {
-+
-+ node = node_iter->data;
-+ keep_looking = FALSE;
-+
-+ is_happy = node->details->online && !node->details->unclean;
-+
-+ if (count_all) {
-+ ++*count_all;
-+ }
-+ if (count_clean && is_happy) {
-+ ++*count_clean;
-+ }
-+ if (count_all || count_clean) {
-+ // If we're counting, we need to go through entire list
-+ keep_looking = TRUE;
-+ }
-+
-+ if (rsc->partial_migration_source != NULL) {
-+ if (node->details == rsc->partial_migration_source->details) {
-+ // This is the migration source
-+ active = node;
-+ } else {
-+ keep_looking = TRUE;
-+ }
-+ } else if (is_not_set(rsc->flags, pe_rsc_needs_fencing)) {
-+ if (is_happy && (!active || !active->details->online
-+ || active->details->unclean)) {
-+ // This is the first clean node
-+ active = node;
-+ } else {
-+ keep_looking = TRUE;
-+ }
-+ }
-+ if (active == NULL) {
-+ // This is first node in list
-+ active = node;
-+ }
-+
-+ if (keep_looking == FALSE) {
-+ // Don't waste time iterating if we don't have to
-+ break;
-+ }
-+ }
-+ return active;
-+}
-+
-+/*!
-+ * \brief
-+ * \internal Find and count active nodes according to "requires"
-+ *
-+ * \param[in] rsc Resource to check
-+ * \param[out] count If not NULL, will be set to count of active nodes
-+ *
-+ * \return An active node (or NULL if resource is not active anywhere)
-+ *
-+ * \note This is a convenience wrapper for pe__find_active_on() where the count
-+ * of all active nodes or only clean active nodes is desired according to
-+ * the "requires" meta-attribute.
-+ */
-+pe_node_t *
-+pe__find_active_requires(const resource_t *rsc, unsigned int *count)
-+{
-+ if (rsc && is_not_set(rsc->flags, pe_rsc_needs_fencing)) {
-+ return pe__find_active_on(rsc, NULL, count);
-+ }
-+ return pe__find_active_on(rsc, count, NULL);
-+}
---
-1.8.3.1
-
-
-From e752fcfa10ee68f8a8de48122ae0f73190ae30af Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Mon, 21 May 2018 09:36:00 -0500
-Subject: [PATCH 3/3] Fix: libpe_status: find active instances properly
- according to requires
-
-If a resource has "requires" set to "nothing" or "quorum", that means we can
-properly start it elsewhere, even if the node believed to be initially running
-the resource is unclean and waiting to be fenced.
-
-Previously, if we did start the resource elsewhere before fencing completed,
-the cluster would then consider the resource multiply active, and recover it.
-Now, we don't consider such a resource multiply active if it's active on
-only one clean node.
-
-Status displays still show the resource as started on the unclean node, to give
-the administrator a better idea of the actual situation. However, the clean
-node will be considered the "current" node.
----
- lib/pengine/native.c | 21 ++++++++--
- pengine/native.c | 107 +++++++++++++++++++++++++--------------------------
- 2 files changed, 70 insertions(+), 58 deletions(-)
-
-diff --git a/lib/pengine/native.c b/lib/pengine/native.c
-index f6d1653..e01ef17 100644
---- a/lib/pengine/native.c
-+++ b/lib/pengine/native.c
-@@ -17,6 +17,21 @@
- #define VARIANT_NATIVE 1
- #include "./variant.h"
-
-+/*!
-+ * \internal
-+ * \brief Check whether a resource is active on multiple nodes
-+ */
-+static bool
-+is_multiply_active(pe_resource_t *rsc)
-+{
-+ unsigned int count = 0;
-+
-+ if (rsc->variant == pe_native) {
-+ pe__find_active_requires(rsc, &count);
-+ }
-+ return count > 1;
-+}
-+
- void
- native_add_running(resource_t * rsc, node_t * node, pe_working_set_t * data_set)
- {
-@@ -58,7 +73,7 @@ native_add_running(resource_t * rsc, node_t * node, pe_working_set_t * data_set)
- return;
- }
-
-- if (rsc->variant == pe_native && g_list_length(rsc->running_on) > 1) {
-+ if (is_multiply_active(rsc)) {
- switch (rsc->recovery_type) {
- case recovery_stop_only:
- {
-@@ -99,8 +114,8 @@ native_add_running(resource_t * rsc, node_t * node, pe_working_set_t * data_set)
- }
- break;
- }
-- crm_debug("%s is active on %d nodes including %s: %s",
-- rsc->id, g_list_length(rsc->running_on), node->details->uname,
-+ crm_debug("%s is active on multiple nodes including %s: %s",
-+ rsc->id, node->details->uname,
- recovery2text(rsc->recovery_type));
-
- } else {
-diff --git a/pengine/native.c b/pengine/native.c
-index e3e0c59..37ac2e4 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -1163,7 +1163,9 @@ native_create_actions(resource_t * rsc, pe_working_set_t * data_set)
- gboolean allow_migrate = is_set(rsc->flags, pe_rsc_allow_migrate) ? TRUE : FALSE;
-
- GListPtr gIter = NULL;
-- int num_active_nodes = 0;
-+ unsigned int num_all_active = 0;
-+ unsigned int num_clean_active = 0;
-+ bool multiply_active = FALSE;
- enum rsc_role_e role = RSC_ROLE_UNKNOWN;
- enum rsc_role_e next_role = RSC_ROLE_UNKNOWN;
-
-@@ -1181,18 +1183,7 @@ native_create_actions(resource_t * rsc, pe_working_set_t * data_set)
- pe_rsc_trace(rsc, "Processing state transition for %s %p: %s->%s", rsc->id, rsc,
- role2text(rsc->role), role2text(rsc->next_role));
-
-- if (rsc->running_on) {
-- current = rsc->running_on->data;
-- }
--
-- for (gIter = rsc->running_on; gIter != NULL; gIter = gIter->next) {
-- node_t *n = (node_t *) gIter->data;
-- if (rsc->partial_migration_source &&
-- (n->details == rsc->partial_migration_source->details)) {
-- current = rsc->partial_migration_source;
-- }
-- num_active_nodes++;
-- }
-+ current = pe__find_active_on(rsc, &num_all_active, &num_clean_active);
-
- for (gIter = rsc->dangling_migrations; gIter != NULL; gIter = gIter->next) {
- node_t *current = (node_t *) gIter->data;
-@@ -1207,47 +1198,57 @@ native_create_actions(resource_t * rsc, pe_working_set_t * data_set)
- }
- }
-
-- if (num_active_nodes > 1) {
-+ if ((num_all_active == 2) && (num_clean_active == 2) && chosen
-+ && rsc->partial_migration_source && rsc->partial_migration_target
-+ && (current->details == rsc->partial_migration_source->details)
-+ && (chosen->details == rsc->partial_migration_target->details)) {
-
-- if (num_active_nodes == 2
-- && chosen
-- && rsc->partial_migration_target
-- && rsc->partial_migration_source
-- && (current->details == rsc->partial_migration_source->details)
-- && (chosen->details == rsc->partial_migration_target->details)) {
-- /* Here the chosen node is still the migration target from a partial
-- * migration. Attempt to continue the migration instead of recovering
-- * by stopping the resource everywhere and starting it on a single node. */
-- pe_rsc_trace(rsc,
-- "Will attempt to continue with a partial migration to target %s from %s",
-- rsc->partial_migration_target->details->id,
-- rsc->partial_migration_source->details->id);
-- } else {
-- const char *type = crm_element_value(rsc->xml, XML_ATTR_TYPE);
-- const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS);
-+ /* The chosen node is still the migration target from a partial
-+ * migration. Attempt to continue the migration instead of recovering
-+ * by stopping the resource everywhere and starting it on a single node.
-+ */
-+ pe_rsc_trace(rsc,
-+ "Will attempt to continue with a partial migration to target %s from %s",
-+ rsc->partial_migration_target->details->id,
-+ rsc->partial_migration_source->details->id);
-+
-+ } else if (is_not_set(rsc->flags, pe_rsc_needs_fencing)) {
-+ /* If a resource has "requires" set to nothing or quorum, don't consider
-+ * it active on unclean nodes (similar to how all resources behave when
-+ * stonith-enabled is false). We can start such resources elsewhere
-+ * before fencing completes, and if we considered the resource active on
-+ * the failed node, we would attempt recovery for being active on
-+ * multiple nodes.
-+ */
-+ multiply_active = (num_clean_active > 1);
-+ } else {
-+ multiply_active = (num_all_active > 1);
-+ }
-
-- if(rsc->partial_migration_target && rsc->partial_migration_source) {
-- crm_notice("Resource %s can no longer migrate to %s. Stopping on %s too", rsc->id,
-- rsc->partial_migration_target->details->uname,
-- rsc->partial_migration_source->details->uname);
-+ if (multiply_active) {
-+ if (rsc->partial_migration_target && rsc->partial_migration_source) {
-+ // Migration was in progress, but we've chosen a different target
-+ crm_notice("Resource %s can no longer migrate to %s. Stopping on %s too",
-+ rsc->id, rsc->partial_migration_target->details->uname,
-+ rsc->partial_migration_source->details->uname);
-
-- } else {
-- pe_proc_err("Resource %s (%s::%s) is active on %d nodes %s",
-- rsc->id, class, type, num_active_nodes, recovery2text(rsc->recovery_type));
-- crm_warn("See %s for more information.",
-- "http://clusterlabs.org/wiki/FAQ#Resource_is_Too_Active");
-- }
--
-- if (rsc->recovery_type == recovery_stop_start) {
-- need_stop = TRUE;
-- }
-+ } else {
-+ // Resource was incorrectly multiply active
-+ pe_proc_err("Resource %s is active on %u nodes (%s)",
-+ rsc->id, num_all_active,
-+ recovery2text(rsc->recovery_type));
-+ crm_notice("See https://wiki.clusterlabs.org/wiki/FAQ#Resource_is_Too_Active for more information");
-+ }
-
-- /* If by chance a partial migration is in process,
-- * but the migration target is not chosen still, clear all
-- * partial migration data. */
-- rsc->partial_migration_source = rsc->partial_migration_target = NULL;
-- allow_migrate = FALSE;
-+ if (rsc->recovery_type == recovery_stop_start) {
-+ need_stop = TRUE;
- }
-+
-+ /* If by chance a partial migration is in process, but the migration
-+ * target is not chosen still, clear all partial migration data.
-+ */
-+ rsc->partial_migration_source = rsc->partial_migration_target = NULL;
-+ allow_migrate = FALSE;
- }
-
- if (is_set(rsc->flags, pe_rsc_start_pending)) {
-@@ -1339,7 +1341,7 @@ native_create_actions(resource_t * rsc, pe_working_set_t * data_set)
- is_not_set(rsc->flags, pe_rsc_managed) ||
- is_set(rsc->flags, pe_rsc_failed) ||
- is_set(rsc->flags, pe_rsc_start_pending) ||
-- (current->details->unclean == TRUE) ||
-+ (current && current->details->unclean) ||
- rsc->next_role < RSC_ROLE_STARTED) {
-
- allow_migrate = FALSE;
-@@ -2329,12 +2331,7 @@ LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal)
-
- next = rsc->allocated_to;
- if (rsc->running_on) {
-- if (g_list_length(rsc->running_on) > 1 && rsc->partial_migration_source) {
-- current = rsc->partial_migration_source;
-- } else {
-- current = rsc->running_on->data;
-- }
--
-+ current = pe__current_node(rsc);
- if (rsc->role == RSC_ROLE_STOPPED) {
- /*
- * This can occur when resources are being recovered
---
-1.8.3.1
-
diff --git a/SOURCES/020-multiple-active.patch b/SOURCES/020-multiple-active.patch
deleted file mode 100644
index 27eec76..0000000
--- a/SOURCES/020-multiple-active.patch
+++ /dev/null
@@ -1,672 +0,0 @@
-From 355461723733acc0f6f9d9cc1318c91ba2a0ae6c Mon Sep 17 00:00:00 2001
-From: Ken Gaillot <kgaillot@redhat.com>
-Date: Tue, 22 May 2018 15:55:14 -0500
-Subject: [PATCH] Fix: all: prefer appropriate node when multiply active
-
----
- lib/pengine/container.c | 8 +++----
- lib/pengine/native.c | 8 +++----
- pengine/allocate.c | 20 ++++++++---------
- pengine/clone.c | 51 +++++++++++++++++++-----------------------
- pengine/graph.c | 26 +++++++++++++---------
- pengine/native.c | 17 +++++++-------
- pengine/notif.c | 2 +-
- tools/crm_mon.c | 14 ++++--------
- tools/crm_resource.c | 21 +++++++++++-------
- tools/crm_resource_print.c | 16 ++++++-------
- tools/crm_resource_runtime.c | 53 ++++++++++++++++++++++----------------------
- 11 files changed, 112 insertions(+), 124 deletions(-)
-
-diff --git a/lib/pengine/container.c b/lib/pengine/container.c
-index b5340bf..d82948a 100644
---- a/lib/pengine/container.c
-+++ b/lib/pengine/container.c
-@@ -807,11 +807,11 @@ container_fix_remote_addr_in(resource_t *rsc, xmlNode *xml, const char *field)
- }
-
- node = tuple->docker->allocated_to;
-- if(node == NULL && tuple->docker->running_on) {
-+ if (node == NULL) {
- /* If it won't be running anywhere after the
- * transition, go with where it's running now.
- */
-- node = tuple->docker->running_on->data;
-+ node = pe__current_node(tuple->docker);
- }
-
- if(node == NULL) {
-@@ -1289,9 +1289,7 @@ tuple_print(container_grouping_t * tuple, const char *pre_text, long options, vo
- offset += snprintf(buffer + offset, LINE_MAX - offset, " (%s)", tuple->ipaddr);
- }
-
-- if (tuple->docker->running_on) {
-- node = tuple->docker->running_on->data;
-- }
-+ node = pe__current_node(tuple->docker);
- common_print(rsc, pre_text, buffer, node, options, print_data);
- }
-
-diff --git a/lib/pengine/native.c b/lib/pengine/native.c
-index e01ef17..eda0355 100644
---- a/lib/pengine/native.c
-+++ b/lib/pengine/native.c
-@@ -457,7 +457,7 @@ native_print_xml(resource_t * rsc, const char *pre_text, long options, void *pri
- if (options & pe_print_rsconly) {
- status_print("/>\n");
- /* do nothing */
-- } else if (g_list_length(rsc->running_on) > 0) {
-+ } else if (rsc->running_on != NULL) {
- GListPtr gIter = rsc->running_on;
-
- status_print(">\n");
-@@ -529,7 +529,7 @@ common_print(resource_t * rsc, const char *pre_text, const char *name, node_t *n
- } else if (is_set(rsc->flags, pe_rsc_failed)) {
- status_print("<font color=\"red\">");
-
-- } else if (rsc->variant == pe_native && g_list_length(rsc->running_on) == 0) {
-+ } else if (rsc->variant == pe_native && (rsc->running_on == NULL)) {
- status_print("<font color=\"red\">");
-
- } else if (g_list_length(rsc->running_on) > 1) {
-@@ -742,9 +742,7 @@ native_print(resource_t * rsc, const char *pre_text, long options, void *print_d
- return;
- }
-
-- if (rsc->running_on != NULL) {
-- node = rsc->running_on->data;
-- }
-+ node = pe__current_node(rsc);
- common_print(rsc, pre_text, rsc_printable_id(rsc), node, options, print_data);
- }
-
-diff --git a/pengine/allocate.c b/pengine/allocate.c
-index 724736c..427575b 100644
---- a/pengine/allocate.c
-+++ b/pengine/allocate.c
-@@ -1101,14 +1101,14 @@ sort_rsc_process_order(gconstpointer a, gconstpointer b, gpointer data)
- r2_weight = -INFINITY;
-
- if (resource1->running_on) {
-- r1_node = g_list_nth_data(resource1->running_on, 0);
-+ r1_node = pe__current_node(resource1);
- r1_node = g_hash_table_lookup(r1_nodes, r1_node->details->id);
- if (r1_node != NULL) {
- r1_weight = r1_node->weight;
- }
- }
- if (resource2->running_on) {
-- r2_node = g_list_nth_data(resource2->running_on, 0);
-+ r2_node = pe__current_node(resource2);
- r2_node = g_hash_table_lookup(r2_nodes, r2_node->details->id);
- if (r2_node != NULL) {
- r2_weight = r2_node->weight;
-@@ -1925,10 +1925,7 @@ get_remote_node_state(pe_node_t *node)
- remote_rsc = node->details->remote_rsc;
- CRM_ASSERT(remote_rsc);
-
-- if(remote_rsc->running_on) {
-- cluster_node = remote_rsc->running_on->data;
-- }
--
-+ cluster_node = pe__current_node(remote_rsc);
-
- /* If the cluster node the remote connection resource resides on
- * is unclean or went offline, we can't process any operations
-@@ -1989,11 +1986,14 @@ get_remote_node_state(pe_node_t *node)
- return remote_state_alive;
- }
-
-+/*!
-+ * \internal
-+ * \brief Order actions on remote node relative to actions for the connection
-+ */
- static void
- apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- {
- resource_t *remote_rsc = NULL;
-- node_t *cluster_node = NULL;
- enum action_tasks task = text2task(action->task);
- enum remote_connection_state state = get_remote_node_state(action->node);
-
-@@ -2009,10 +2009,6 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- remote_rsc = action->node->details->remote_rsc;
- CRM_ASSERT(remote_rsc);
-
-- if(remote_rsc->running_on) {
-- cluster_node = remote_rsc->running_on->data;
-- }
--
- crm_trace("Order %s action %s relative to %s%s (state: %s)",
- action->task, action->uuid,
- is_set(remote_rsc->flags, pe_rsc_failed)? "failed " : "",
-@@ -2093,6 +2089,8 @@ apply_remote_ordering(action_t *action, pe_working_set_t *data_set)
- pe_order_implies_then, data_set);
-
- } else {
-+ node_t *cluster_node = pe__current_node(remote_rsc);
-+
- if(task == monitor_rsc && state == remote_state_failed) {
- /* We would only be here if we do not know the
- * state of the resource on the remote node.
-diff --git a/pengine/clone.c b/pengine/clone.c
-index 3192412..1de2661 100644
---- a/pengine/clone.c
-+++ b/pengine/clone.c
-@@ -69,6 +69,10 @@ sort_clone_instance(gconstpointer a, gconstpointer b, gpointer data_set)
- int rc = 0;
- node_t *node1 = NULL;
- node_t *node2 = NULL;
-+ node_t *current_node1 = NULL;
-+ node_t *current_node2 = NULL;
-+ unsigned int nnodes1 = 0;
-+ unsigned int nnodes2 = 0;
-
- gboolean can1 = TRUE;
- gboolean can2 = TRUE;
-@@ -87,24 +91,22 @@ sort_clone_instance(gconstpointer a, gconstpointer b, gpointer data_set)
- * - inactive instances
- */
-
-- if (resource1->running_on && resource2->running_on) {
-- if (g_list_length(resource1->running_on) < g_list_length(resource2->running_on)) {
-+ current_node1 = pe__find_active_on(resource1, &nnodes1, NULL);
-+ current_node2 = pe__find_active_on(resource2, &nnodes2, NULL);
-+
-+ if (nnodes1 && nnodes2) {
-+ if (nnodes1 < nnodes2) {
- crm_trace("%s < %s: running_on", resource1->id, resource2->id);
- return -1;
-
-- } else if (g_list_length(resource1->running_on) > g_list_length(resource2->running_on)) {
-+ } else if (nnodes1 > nnodes2) {
- crm_trace("%s > %s: running_on", resource1->id, resource2->id);
- return 1;
- }
- }
-
-- if (resource1->running_on) {
-- node1 = resource1->running_on->data;
-- }
-- if (resource2->running_on) {
-- node2 = resource2->running_on->data;
-- }
--
-+ node1 = current_node1;
-+ node2 = current_node2;
- if (node1) {
- node_t *match = pe_hash_table_lookup(resource1->allowed_nodes, node1->details->id);
-
-@@ -216,10 +218,10 @@ sort_clone_instance(gconstpointer a, gconstpointer b, gpointer data_set)
- GHashTable *hash2 =
- g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, g_hash_destroy_str);
-
-- n = node_copy(resource1->running_on->data);
-+ n = node_copy(current_node1);
- g_hash_table_insert(hash1, (gpointer) n->details->id, n);
-
-- n = node_copy(resource2->running_on->data);
-+ n = node_copy(current_node2);
- g_hash_table_insert(hash2, (gpointer) n->details->id, n);
-
- if(resource1->parent) {
-@@ -267,11 +269,8 @@ sort_clone_instance(gconstpointer a, gconstpointer b, gpointer data_set)
- }
-
- /* Current location score */
-- node1 = g_list_nth_data(resource1->running_on, 0);
-- node1 = g_hash_table_lookup(hash1, node1->details->id);
--
-- node2 = g_list_nth_data(resource2->running_on, 0);
-- node2 = g_hash_table_lookup(hash2, node2->details->id);
-+ node1 = g_hash_table_lookup(hash1, current_node1->details->id);
-+ node2 = g_hash_table_lookup(hash2, current_node2->details->id);
-
- if (node1->weight < node2->weight) {
- if (node1->weight < 0) {
-@@ -295,12 +294,8 @@ sort_clone_instance(gconstpointer a, gconstpointer b, gpointer data_set)
- list1 = g_hash_table_get_values(hash1);
- list2 = g_hash_table_get_values(hash2);
-
-- list1 =
-- g_list_sort_with_data(list1, sort_node_weight,
-- g_list_nth_data(resource1->running_on, 0));
-- list2 =
-- g_list_sort_with_data(list2, sort_node_weight,
-- g_list_nth_data(resource2->running_on, 0));
-+ list1 = g_list_sort_with_data(list1, sort_node_weight, current_node1);
-+ list2 = g_list_sort_with_data(list2, sort_node_weight, current_node2);
- max = g_list_length(list1);
- if (max < g_list_length(list2)) {
- max = g_list_length(list2);
-@@ -528,8 +523,8 @@ distribute_children(resource_t *rsc, GListPtr children, GListPtr nodes,
-
- if (child->running_on && is_set(child->flags, pe_rsc_provisional)
- && is_not_set(child->flags, pe_rsc_failed)) {
-- node_t *child_node = child->running_on->data;
-- node_t *local_node = parent_node_instance(child, child->running_on->data);
-+ node_t *child_node = pe__current_node(child);
-+ node_t *local_node = parent_node_instance(child, child_node);
-
- pe_rsc_trace(rsc, "Checking pre-allocation of %s to %s (%d remaining of %d)",
- child->id, child_node->details->uname, max - allocated, max);
-@@ -556,9 +551,9 @@ distribute_children(resource_t *rsc, GListPtr children, GListPtr nodes,
- for (GListPtr gIter = children; gIter != NULL; gIter = gIter->next) {
- resource_t *child = (resource_t *) gIter->data;
-
-- if (g_list_length(child->running_on) > 0) {
-- node_t *child_node = child->running_on->data;
-- node_t *local_node = parent_node_instance(child, child->running_on->data);
-+ if (child->running_on != NULL) {
-+ node_t *child_node = pe__current_node(child);
-+ node_t *local_node = parent_node_instance(child, child_node);
-
- if (local_node == NULL) {
- crm_err("%s is running on %s which isn't allowed",
-diff --git a/pengine/graph.c b/pengine/graph.c
-index 6d4e4c7..236b278 100644
---- a/pengine/graph.c
-+++ b/pengine/graph.c
-@@ -783,6 +783,7 @@ get_router_node(action_t *action)
- node_t *began_on = NULL;
- node_t *ended_on = NULL;
- node_t *router_node = NULL;
-+ bool partial_migration = FALSE;
-
- if (safe_str_eq(action->task, CRM_OP_FENCE) || is_remote_node(action->node) == FALSE) {
- return NULL;
-@@ -790,10 +791,13 @@ get_router_node(action_t *action)
-
- CRM_ASSERT(action->node->details->remote_rsc != NULL);
-
-- if (action->node->details->remote_rsc->running_on) {
-- began_on = action->node->details->remote_rsc->running_on->data;
-- }
-+ began_on = pe__current_node(action->node->details->remote_rsc);
- ended_on = action->node->details->remote_rsc->allocated_to;
-+ if (action->node->details->remote_rsc
-+ && (action->node->details->remote_rsc->container == NULL)
-+ && action->node->details->remote_rsc->partial_migration_target) {
-+ partial_migration = TRUE;
-+ }
-
- /* if there is only one location to choose from,
- * this is easy. Check for those conditions first */
-@@ -817,6 +821,10 @@ get_router_node(action_t *action)
- * are all required before the remote rsc stop action can occur.) In
- * this case, we know these actions have to be routed through the initial
- * cluster node the connection resource lived on before the move takes place.
-+ * The exception is a partial migration of a (non-guest) remote
-+ * connection resource; in that case, all actions (even these) will be
-+ * ordered after the connection's pseudo-start on the migration target,
-+ * so the target is the router node.
- *
- * 2. Everything else (start, promote, monitor, probe, refresh, clear failcount
- * delete ....) must occur after the resource starts on the node it is
-@@ -824,10 +832,10 @@ get_router_node(action_t *action)
- */
-
- /* 1. before connection rsc moves. */
-- if (safe_str_eq(action->task, "stop") ||
-+ if ((safe_str_eq(action->task, "stop") ||
- safe_str_eq(action->task, "demote") ||
- safe_str_eq(action->task, "migrate_from") ||
-- safe_str_eq(action->task, "migrate_to")) {
-+ safe_str_eq(action->task, "migrate_to")) && !partial_migration) {
-
- router_node = began_on;
-
-@@ -1234,18 +1242,14 @@ action2xml(action_t * action, gboolean as_input, pe_working_set_t *data_set)
- case stopped_rsc:
- case action_demote:
- case action_demoted:
-- if(action->node->details->remote_rsc->container->running_on) {
-- host = action->node->details->remote_rsc->container->running_on->data;
-- }
-+ host = pe__current_node(action->node->details->remote_rsc->container);
- break;
- case start_rsc:
- case started_rsc:
- case monitor_rsc:
- case action_promote:
- case action_promoted:
-- if(action->node->details->remote_rsc->container->allocated_to) {
-- host = action->node->details->remote_rsc->container->allocated_to;
-- }
-+ host = action->node->details->remote_rsc->container->allocated_to;
- break;
- default:
- break;
-diff --git a/pengine/native.c b/pengine/native.c
-index 37ac2e4..1c26642 100644
---- a/pengine/native.c
-+++ b/pengine/native.c
-@@ -102,7 +102,7 @@ native_choose_node(resource_t * rsc, node_t * prefer, pe_working_set_t * data_se
- if (length > 0) {
- nodes = g_hash_table_get_values(rsc->allowed_nodes);
- nodes = g_list_sort_with_data(nodes, sort_node_weight,
-- g_list_nth_data(rsc->running_on, 0));
-+ pe__current_node(rsc));
-
- // First node in sorted list has the best score
- best = g_list_nth_data(nodes, 0);
-@@ -158,7 +158,7 @@ native_choose_node(resource_t * rsc, node_t * prefer, pe_working_set_t * data_se
- * remaining unallocated instances to prefer a node that's already
- * running another instance.
- */
-- node_t *running = g_list_nth_data(rsc->running_on, 0);
-+ node_t *running = pe__current_node(rsc);
-
- if (running && (can_run_resources(running) == FALSE)) {
- pe_rsc_trace(rsc, "Current node for %s (%s) can't run resources",
-@@ -534,16 +534,14 @@ native_color(resource_t * rsc, node_t * prefer, pe_working_set_t * data_set)
- node_t *assign_to = NULL;
-
- rsc->next_role = rsc->role;
-- if (rsc->running_on == NULL) {
-+ assign_to = pe__current_node(rsc);
-+ if (assign_to == NULL) {
- reason = "inactive";
- } else if (rsc->role == RSC_ROLE_MASTER) {
-- assign_to = rsc->running_on->data;
- reason = "master";
- } else if (is_set(rsc->flags, pe_rsc_failed)) {
-- assign_to = rsc->running_on->data;
- reason = "failed";
- } else {
-- assign_to = rsc->running_on->data;
- reason = "active";
- }
- pe_rsc_info(rsc, "Unmanaged resource %s allocated to %s: %s", rsc->id,
-@@ -1834,7 +1832,9 @@ rsc_ticket_constraint(resource_t * rsc_lh, rsc_ticket_t * rsc_ticket, pe_working
- rsc_lh->id, rsc_ticket->ticket->id, rsc_ticket->id,
- role2text(rsc_ticket->role_lh));
-
-- if (rsc_ticket->ticket->granted == FALSE && g_list_length(rsc_lh->running_on) > 0) {
-+ if ((rsc_ticket->ticket->granted == FALSE)
-+ && (rsc_lh->running_on != NULL)) {
-+
- GListPtr gIter = NULL;
-
- switch (rsc_ticket->loss_policy) {
-@@ -1867,7 +1867,7 @@ rsc_ticket_constraint(resource_t * rsc_lh, rsc_ticket_t * rsc_ticket, pe_working
- if (filter_rsc_ticket(rsc_lh, rsc_ticket) == FALSE) {
- return;
- }
-- if (g_list_length(rsc_lh->running_on) > 0) {
-+ if (rsc_lh->running_on != NULL) {
- clear_bit(rsc_lh->flags, pe_rsc_managed);
- set_bit(rsc_lh->flags, pe_rsc_block);
- }
-@@ -1919,7 +1919,6 @@ native_update_actions(action_t * first, action_t * then, node_t * node, enum pe_
- } else if ((then_rsc_role >= RSC_ROLE_STARTED)
- && safe_str_eq(then->task, RSC_START)
- && then->node
-- && then_rsc->running_on
- && g_list_length(then_rsc->running_on) == 1
- && then->node->details == ((node_t *) then_rsc->running_on->data)->details) {
- /* ignore... if 'then' is supposed to be started after 'first', but
-diff --git a/pengine/notif.c b/pengine/notif.c
-index 3013ee0..4913249 100644
---- a/pengine/notif.c
-+++ b/pengine/notif.c
-@@ -113,7 +113,7 @@ expand_node_list(GListPtr list, char **uname, char **metal)
- if(node->details->remote_rsc
- && node->details->remote_rsc->container
- && node->details->remote_rsc->container->running_on) {
-- node = node->details->remote_rsc->container->running_on->data;
-+ node = pe__current_node(node->details->remote_rsc->container);
- }
-
- if (node->details->uname == NULL) {
-diff --git a/tools/crm_mon.c b/tools/crm_mon.c
-index 824b12f..7c63803 100644
---- a/tools/crm_mon.c
-+++ b/tools/crm_mon.c
-@@ -1953,16 +1953,10 @@ get_node_display_name(node_t *node)
-
- /* Host is displayed only if this is a guest node */
- if (is_container_remote_node(node)) {
-- if (node->details->remote_rsc->running_on) {
-- /* running_on is a list, but guest nodes will have exactly one entry
-- * unless they are in the process of migrating, in which case they
-- * will have two; either way, we can use the first item in the list
-- */
-- node_t *host_node = (node_t *) node->details->remote_rsc->running_on->data;
--
-- if (host_node && host_node->details) {
-- node_host = host_node->details->uname;
-- }
-+ node_t *host_node = pe__current_node(node->details->remote_rsc);
-+
-+ if (host_node && host_node->details) {
-+ node_host = host_node->details->uname;
- }
- if (node_host == NULL) {
- node_host = ""; /* so we at least get "uname@" to indicate guest */
-diff --git a/tools/crm_resource.c b/tools/crm_resource.c
-index c64432e..0557892 100644
---- a/tools/crm_resource.c
-+++ b/tools/crm_resource.c
-@@ -1015,23 +1015,27 @@ main(int argc, char **argv)
- rc = cli_resource_ban(rsc_id, dest->details->uname, NULL, cib_conn);
-
- } else if (rsc_cmd == 'B' || rsc_cmd == 'M') {
-+ pe_node_t *current = NULL;
-+ unsigned int nactive = 0;
-+
- rc = -EINVAL;
-- if (g_list_length(rsc->running_on) == 1) {
-- node_t *current = rsc->running_on->data;
-+ current = pe__find_active_requires(rsc, &nactive);
-+
-+ if (nactive == 1) {
- rc = cli_resource_ban(rsc_id, current->details->uname, NULL, cib_conn);
-
- } else if(rsc->variant == pe_master) {
- int count = 0;
- GListPtr iter = NULL;
-- node_t *current = NULL;
-
-+ current = NULL;
- for(iter = rsc->children; iter; iter = iter->next) {
- resource_t *child = (resource_t *)iter->data;
- enum rsc_role_e child_role = child->fns->state(child, TRUE);
-
- if(child_role == RSC_ROLE_MASTER) {
- count++;
-- current = child->running_on->data;
-+ current = pe__current_node(child);
- }
- }
-
-@@ -1039,14 +1043,15 @@ main(int argc, char **argv)
- rc = cli_resource_ban(rsc_id, current->details->uname, NULL, cib_conn);
-
- } else {
-- CMD_ERR("Resource '%s' not moved: active in %d locations (promoted in %d).", rsc_id, g_list_length(rsc->running_on), count);
-+ CMD_ERR("Resource '%s' not moved: active in %d locations (promoted in %d).",
-+ rsc_id, nactive, count);
- CMD_ERR("You can prevent '%s' from running on a specific location with: --ban --node <name>", rsc_id);
- CMD_ERR("You can prevent '%s' from being promoted at a specific location with:"
- " --ban --master --node <name>", rsc_id);
- }
-
- } else {
-- CMD_ERR("Resource '%s' not moved: active in %d locations.", rsc_id, g_list_length(rsc->running_on));
-+ CMD_ERR("Resource '%s' not moved: active in %d locations.", rsc_id, nactive);
- CMD_ERR("You can prevent '%s' from running on a specific location with: --ban --node <name>", rsc_id);
- }
-
-@@ -1164,12 +1169,12 @@ main(int argc, char **argv)
- node_t *node = pe_find_node(data_set.nodes, host_uname);
-
- if (node && is_remote_node(node)) {
-- if (node->details->remote_rsc == NULL || node->details->remote_rsc->running_on == NULL) {
-+ node = pe__current_node(node->details->remote_rsc);
-+ if (node == NULL) {
- CMD_ERR("No lrmd connection detected to remote node %s", host_uname);
- rc = -ENXIO;
- goto bail;
- }
-- node = node->details->remote_rsc->running_on->data;
- router_node = node->details->uname;
- attr_options |= attrd_opt_remote;
- }
-diff --git a/tools/crm_resource_print.c b/tools/crm_resource_print.c
-index d066c42..2463fb5 100644
---- a/tools/crm_resource_print.c
-+++ b/tools/crm_resource_print.c
-@@ -68,6 +68,7 @@ cli_resource_print_cts(resource_t * rsc)
- const char *rtype = crm_element_value(rsc->xml, XML_ATTR_TYPE);
- const char *rprov = crm_element_value(rsc->xml, XML_AGENT_ATTR_PROVIDER);
- const char *rclass = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS);
-+ pe_node_t *node = pe__current_node(rsc);
-
- if (safe_str_eq(rclass, PCMK_RESOURCE_CLASS_STONITH)) {
- xmlNode *op = NULL;
-@@ -90,10 +91,8 @@ cli_resource_print_cts(resource_t * rsc)
- }
- }
-
-- if (rsc->running_on != NULL && g_list_length(rsc->running_on) == 1) {
-- node_t *tmp = rsc->running_on->data;
--
-- host = tmp->details->uname;
-+ if (node != NULL) {
-+ host = node->details->uname;
- }
-
- printf("Resource: %s %s %s %s %s %s %s %s %d %lld 0x%.16llx\n",
-@@ -315,16 +314,15 @@ int
- cli_resource_print_attribute(resource_t *rsc, const char *attr, pe_working_set_t * data_set)
- {
- int rc = -ENXIO;
-- node_t *current = NULL;
-+ unsigned int count = 0;
- GHashTable *params = NULL;
- const char *value = NULL;
-+ node_t *current = pe__find_active_on(rsc, &count, NULL);
-
-- if (g_list_length(rsc->running_on) == 1) {
-- current = rsc->running_on->data;
--
-- } else if (g_list_length(rsc->running_on) > 1) {
-+ if (count > 1) {
- CMD_ERR("%s is active on more than one node,"
- " returning the default value for %s", rsc->id, crm_str(attr));
-+ current = NULL;
- }
-
- params = crm_str_table_new();
-diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
-index 5e54f9e..5004935 100644
---- a/tools/crm_resource_runtime.c
-+++ b/tools/crm_resource_runtime.c
-@@ -473,11 +473,11 @@ send_lrm_rsc_op(crm_ipc_t * crmd_channel, const char *op,
- node_t *node = pe_find_node(data_set->nodes, host_uname);
-
- if (node && is_remote_node(node)) {
-- if (node->details->remote_rsc == NULL || node->details->remote_rsc->running_on == NULL) {
-+ node = pe__current_node(node->details->remote_rsc);
-+ if (node == NULL) {
- CMD_ERR("No lrmd connection detected to remote node %s", host_uname);
- return -ENXIO;
- }
-- node = node->details->remote_rsc->running_on->data;
- router_node = node->details->uname;
- }
- }
-@@ -1648,11 +1648,16 @@ cli_resource_move(resource_t *rsc, const char *rsc_id, const char *host_name,
- cib_t *cib, pe_working_set_t *data_set)
- {
- int rc = -EINVAL;
-- int count = 0;
-+ unsigned int count = 0;
- node_t *current = NULL;
- node_t *dest = pe_find_node(data_set->nodes, host_name);
- bool cur_is_dest = FALSE;
-
-+ if (dest == NULL) {
-+ CMD_ERR("Error performing operation: node '%s' is unknown", host_name);
-+ return -ENXIO;
-+ }
-+
- if (scope_master && rsc->variant != pe_master) {
- resource_t *p = uber_parent(rsc);
- if(p->variant == pe_master) {
-@@ -1667,8 +1672,12 @@ cli_resource_move(resource_t *rsc, const char *rsc_id, const char *host_name,
- }
- }
-
-+ current = pe__find_active_requires(rsc, &count);
-+
- if(rsc->variant == pe_master) {
- GListPtr iter = NULL;
-+ unsigned int master_count = 0;
-+ pe_node_t *master_node = NULL;
-
- for(iter = rsc->children; iter; iter = iter->next) {
- resource_t *child = (resource_t *)iter->data;
-@@ -1676,37 +1685,27 @@ cli_resource_move(resource_t *rsc, const char *rsc_id, const char *host_name,
-
- if(child_role == RSC_ROLE_MASTER) {
- rsc = child;
-- count++;
-+ master_node = pe__current_node(child);
-+ master_count++;
- }
- }
--
-- if(scope_master == FALSE && count == 0) {
-- count = g_list_length(rsc->running_on);
-+ if (scope_master || master_count) {
-+ count = master_count;
-+ current = master_node;
- }
-
-- } else if (pe_rsc_is_clone(rsc)) {
-- count = g_list_length(rsc->running_on);
--
-- } else if (g_list_length(rsc->running_on) > 1) {
-- CMD_ERR("Resource '%s' not moved: active on multiple nodes", rsc_id);
-- return rc;
-- }
--
-- if(dest == NULL) {
-- CMD_ERR("Error performing operation: node '%s' is unknown", host_name);
-- return -ENXIO;
- }
-
-- if(g_list_length(rsc->running_on) == 1) {
-- current = rsc->running_on->data;
-+ if (count > 1) {
-+ if (pe_rsc_is_clone(rsc)) {
-+ current = NULL;
-+ } else {
-+ CMD_ERR("Resource '%s' not moved: active on multiple nodes", rsc_id);
-+ return rc;
-+ }
- }
-
-- if(current == NULL) {
-- /* Nothing to check */
--
-- } else if(scope_master && rsc->fns->state(rsc, TRUE) != RSC_ROLE_MASTER) {
-- crm_trace("%s is already active on %s but not in correct state", rsc_id, dest->details->uname);
-- } else if (safe_str_eq(current->details->uname, dest->details->uname)) {
-+ if (current && (current->details == dest->details)) {
- cur_is_dest = TRUE;
- if (do_force) {
- crm_info("%s is already %s on %s, reinforcing placement with location constraint.",
-@@ -1736,7 +1735,7 @@ cli_resource_move(resource_t *rsc, const char *rsc_id, const char *host_name,
- (void)cli_resource_ban(rsc_id, current->details->uname, NULL, cib);
-
- } else if(count > 1) {
-- CMD_ERR("Resource '%s' is currently %s in %d locations. One may now move one to %s",
-+ CMD_ERR("Resource '%s' is currently %s in %d locations. One may now move to %s",
- rsc_id, scope_master?"promoted":"active", count, dest->details->uname);
- CMD_ERR("You can prevent '%s' from being %s at a specific location with:"
- " --ban %s--host <name>", rsc_id, scope_master?"promoted":"active", scope_master?"--master ":"");
---
-1.8.3.1
-
diff --git a/SOURCES/2.0-cleanup-behavior.patch b/SOURCES/2.0-cleanup-behavior.patch
new file mode 100644
index 0000000..bd547d7
--- /dev/null
+++ b/SOURCES/2.0-cleanup-behavior.patch
@@ -0,0 +1,76 @@
+From 612fcbb399cfaa558504eeaa6ab16064e9013238 Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Tue, 7 Aug 2018 11:56:06 -0500
+Subject: [PATCH] Feature: tools: enable 2.0 behavior of crm_resource clean-up
+
+---
+ tools/crm_resource.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/tools/crm_resource.c b/tools/crm_resource.c
+index 5b20873..479c69d 100644
+--- a/tools/crm_resource.c
++++ b/tools/crm_resource.c
+@@ -212,8 +212,6 @@ static struct crm_option long_options[] = {
+ },
+ {
+ "cleanup", no_argument, NULL, 'C',
+-#if 0
+- // new behavior disabled until 2.0.0
+ "\t\tIf resource has any past failures, clear its history and fail count.\n"
+ "\t\t\t\tOptionally filtered by --resource, --node, --operation, and --interval (otherwise all).\n"
+ "\t\t\t\t--operation and --interval apply to fail counts, but entire history is always cleared,\n"
+@@ -221,7 +219,6 @@ static struct crm_option long_options[] = {
+ },
+ {
+ "refresh", no_argument, NULL, 'R',
+-#endif
+ "\t\tDelete resource's history (including failures) so its current state is rechecked.\n"
+ "\t\t\t\tOptionally filtered by --resource and --node (otherwise all).\n"
+ "\t\t\t\tUnless --force is specified, resource's group or clone (if any) will also be refreshed."
+@@ -352,13 +349,11 @@ static struct crm_option long_options[] = {
+ },
+ {
+ "operation", required_argument, NULL, 'n',
+- "\tOperation to clear instead of all (with -C -r)",
+- pcmk_option_hidden // only used with 2.0 -C behavior
++ "\tOperation to clear instead of all (with -C -r)"
+ },
+ {
+ "interval", required_argument, NULL, 'I',
+- "\tInterval of operation to clear (default 0) (with -C -r -n)",
+- pcmk_option_hidden // only used with 2.0 -C behavior
++ "\tInterval of operation to clear (default 0) (with -C -r -n)"
+ },
+ {
+ "set-name", required_argument, NULL, 's',
+@@ -388,7 +383,6 @@ static struct crm_option long_options[] = {
+ {"un-migrate", no_argument, NULL, 'U', NULL, pcmk_option_hidden},
+ {"un-move", no_argument, NULL, 'U', NULL, pcmk_option_hidden},
+
+- {"refresh", 0, 0, 'R', NULL, pcmk_option_hidden}, // remove this line for 2.0.0
+ {"reprobe", no_argument, NULL, 'P', NULL, pcmk_option_hidden},
+
+ {"-spacer-", 1, NULL, '-', "\nExamples:", pcmk_option_paragraph},
+@@ -630,15 +624,16 @@ main(int argc, char **argv)
+ timeout_ms = crm_get_msec(optarg);
+ break;
+
++ case 'P':
++ flag = 'R';
+ case 'C':
+ case 'R':
+- case 'P':
+ crm_log_args(argc, argv);
+ require_resource = FALSE;
+ if (cib_file == NULL) {
+ require_crmd = TRUE;
+ }
+- rsc_cmd = 'R'; // disable new behavior until 2.0
++ rsc_cmd = flag;
+ find_flags = pe_find_renamed|pe_find_anon;
+ break;
+
+--
+1.8.3.1
+
diff --git a/SOURCES/2.0-record-pending-behavior.patch b/SOURCES/2.0-record-pending-behavior.patch
new file mode 100644
index 0000000..22f49f7
--- /dev/null
+++ b/SOURCES/2.0-record-pending-behavior.patch
@@ -0,0 +1,48 @@
+From b48ceeb041cee65a9b93b9b76235e475fa1a128f Mon Sep 17 00:00:00 2001
+From: Ken Gaillot <kgaillot@redhat.com>
+Date: Mon, 16 Oct 2017 09:45:18 -0500
+Subject: [PATCH 2/2] Feature: crmd: default record-pending to TRUE
+
+---
+ crmd/lrm.c | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/crmd/lrm.c b/crmd/lrm.c
+index eb4e16e..36dc076 100644
+--- a/crmd/lrm.c
++++ b/crmd/lrm.c
+@@ -2061,25 +2061,22 @@ stop_recurring_actions(gpointer key, gpointer value, gpointer user_data)
+ static void
+ record_pending_op(const char *node_name, lrmd_rsc_info_t *rsc, lrmd_event_data_t *op)
+ {
++ const char *record_pending = NULL;
++
+ CRM_CHECK(node_name != NULL, return);
+ CRM_CHECK(rsc != NULL, return);
+ CRM_CHECK(op != NULL, return);
+
+ // Never record certain operation types as pending
+- if (op->op_type == NULL
++ if ((op->op_type == NULL) || (op->params == NULL)
+ || !controld_action_is_recordable(op->op_type)) {
+ return;
+ }
+
+- if (op->params == NULL) {
++ // defaults to true
++ record_pending = crm_meta_value(op->params, XML_OP_ATTR_PENDING);
++ if (record_pending && !crm_is_true(record_pending)) {
+ return;
+-
+- } else {
+- const char *record_pending = crm_meta_value(op->params, XML_OP_ATTR_PENDING);
+-
+- if (record_pending == NULL || crm_is_true(record_pending) == FALSE) {
+- return;
+- }
+ }
+
+ op->call_id = -1;
+--
+1.8.3.1
+
diff --git a/SPECS/pacemaker.spec b/SPECS/pacemaker.spec
index 18acc4e..6a47ba2 100644
--- a/SPECS/pacemaker.spec
+++ b/SPECS/pacemaker.spec
@@ -13,12 +13,12 @@
## Upstream pacemaker version, and its package version (specversion
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
-%global pcmkversion 1.1.18
-%global specversion 11
+%global pcmkversion 1.1.19
+%global specversion 8
## Upstream commit (or git tag, such as "Pacemaker-" plus the
## {pcmkversion} macro for an official release) to use for this package
-%global commit 2b07d5c5a908998891c3317faa30328c108d3a91
+%global commit c3c624ea3d98a74a8a287671a156db126c99a7bb
## Since git v2.11, the extent of abbreviation is autoscaled by default
## (used to be constant of 7), so we need to convey it for non-tags, too.
%global commit_abbrev 7
@@ -43,9 +43,6 @@
case "%{shortcommit}" in *-rc[[:digit:]]*%{rparen} false;;
esac; }; echo $?)
-## Whether this is a development branch
-%define post_release %([ %{commit} = Pacemaker-%{shortcommit} ]; echo $?)
-
## Turn off auto-compilation of python files outside site-packages directory,
## so that the -libs-devel package is multilib-compliant (no *.py[co] files)
%global __os_install_post %(echo '%{__os_install_post}' | {
@@ -163,7 +160,7 @@
Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
Version: %{pcmkversion}
-Release: %{pcmk_release}%{?dist}.3
+Release: %{pcmk_release}%{?dist}
%if %{defined _unitdir}
License: GPLv2+ and LGPLv2+
%else
@@ -179,30 +176,19 @@ Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{na
Source1: nagios-agents-metadata-%{nagios_hash}.tar.gz
# upstream commits
-Patch1: 001-new-behavior.patch
-Patch2: 002-fixes.patch
-Patch3: 003-cleanup.patch
+Patch1: 001-rollup.patch
+Patch2: 002-ppc64le.patch
+Patch3: 003-static-analysis.patch
Patch4: 004-cleanup.patch
-Patch5: 005-cleanup.patch
-Patch6: 006-leaks.patch
-Patch7: 007-bundles.patch
-Patch8: 008-quorum.patch
-Patch9: 009-crm_resource.patch
-Patch10: 010-crm_master.patch
-Patch11: 011-regression-tests.patch
-Patch12: 012-notifs.patch
-Patch13: 013-notifs-tests.patch
-Patch14: 014-segfault.patch
-Patch15: 015-fail-timeout.patch
-Patch16: 016-crm_diff.patch
-Patch17: 017-pending-notify.patch
-Patch18: 018-node-names.patch
-Patch19: 019-requires-quorum.patch
-Patch20: 020-multiple-active.patch
+Patch5: 005-corosync.patch
+Patch6: 006-fail-count.patch
+Patch7: 007-stderr.patch
# patches that aren't from upstream
Patch100: lrmd-protocol-version.patch
Patch101: rhbz-url.patch
+Patch102: 2.0-record-pending-behavior.patch
+Patch103: 2.0-cleanup-behavior.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
AutoReqProv: on
@@ -216,7 +202,7 @@ Provides: pcmk-cluster-manager
%{?systemd_requires}
-ExclusiveArch: i686 x86_64 ppc64le s390x
+ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
# Pacemaker targets compatibility with python 2.6+ and 3.2+
Requires: python >= 2.6
@@ -267,7 +253,7 @@ BuildRequires: cluster-glue-libs-devel
## (note no avoiding effect when building through non-customized mock)
%if !%{bleeding}
%if %{with doc}
-BuildRequires: publican inkscape asciidoc
+BuildRequires: inkscape asciidoc publican
%endif
%endif
@@ -339,6 +325,7 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release}
Requires: resource-agents
Provides: pcmk-cluster-manager
+
# -remote can be fully independent of systemd
%{?systemd_ordering}%{!?systemd_ordering:%{?systemd_requires}}
@@ -485,8 +472,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{_smp_mflags} V=1 all
%check
-# Prevent false positives in rpmlint
-./BasicSanity.sh -V pengine cli 2>&1 | sed s/[fF]ail/faiil/g
+{ pengine/regression.sh --run one-or-more-unrunnable-instances \
+ && tools/regression.sh \
+ && touch .CHECKED
+} 2>&1 | sed 's/[fF]ail/faiil/g' # prevent false positives in rpmlint
+[ -f .CHECKED ] && rm -f -- .CHECKED || false
%install
rm -rf %{buildroot}
@@ -522,6 +512,12 @@ find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
+# For now, don't package the servicelog-related binaries built only for
+# ppc64le when certain dependencies are installed. If they get more exercise by
+# advanced users, we can reconsider.
+rm -f %{buildroot}/%{_sbindir}/notifyServicelogEvent
+rm -f %{buildroot}/%{_sbindir}/ipmiservicelogd
+
# Do not package these either
rm -f %{buildroot}/%{_libdir}/service_crm.so
rm -f %{buildroot}/%{_sbindir}/fence_legacy
@@ -871,23 +867,75 @@ exit 0
%attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/*
%changelog
-* Tue Jun 5 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.18-11.3
-- Fix regression in handling of mixed-case node names
-- Avoid multiple recovery of stonith devices
-- Resolves: rhbz#1583747
-- Resolves: rhbz#1585741
-
-* Fri Apr 20 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.18-11.2
-- Do not record pending notify actions as completed
-- Resolves: rhbz#1570618
-
-* Wed Apr 18 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.18-11.1
-- Do not schedule notifications for unrunnable actions
-- Do not expire remote failures if fencing is pending
-- Do not consider attribute order difference as CIB change in crm_diff
-- Resolves: rhbz#1563345
-- Resolves: rhbz#1566533
-- Resolves: rhbz#1568720
+* Mon Sep 24 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-8
+- Ensure crm_resource --force-* commands get stderr messages
+- Resolves: rhbz#1628947
+
+* Tue Aug 14 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-7
+- Shutdown corosync locally if fenced
+- Count start failure once
+- Resolves: rhbz#1448221
+- Resolves: rhbz#1549576
+
+* Tue Aug 7 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-6
+- Fix pre-release regressions in resource clean-up behavior
+- Resolves: rhbz#1612869
+
+* Mon Jul 30 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-5
+- Another fix for srpm build on ppc64le systems with OpenIPMI-devel
+- Resolves: rhbz#1478451
+
+* Wed Jul 25 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-4
+- Fix srpm build on ppc64le systems with libservicelog-devel, OpenIPMI-devel
+- Resolves: rhbz#1478451
+
+* Wed Jul 11 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-3
+- Rebase to upstream c3c624ea3d98a74a8a287671a156db126c99a7bb (1.1.19)
+- Resolves: rhbz#1562255
+
+* Thu Jul 5 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-2
+- Ensure resource agent meta-data actions can get local node name
+- Do not record pending clone notifications in CIB
+- Resolves: rhbz#1374175
+- Resolves: rhbz#1570130
+
+* Wed Jun 20 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.19-1
+- Rebase to upstream 29ac12ad21f73524f69c0580798e07cdf1fe3fa0 (1.1.19-rc1)
+- Allow crm_node to work on Pacemaker Remote nodes
+- Implement new --validate option to stonith_admin
+- Support .path, .mount, and .timer systemd unit files as resources
+- Handle INFINITY fail count correctly in crm_failcount
+- Resolves: rhbz#1374175
+- Resolves: rhbz#1434936
+- Resolves: rhbz#1562255
+- Resolves: rhbz#1590483
+- Resolves: rhbz#1591045
+
+* Fri Jun 1 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.18-13
+- Pull latest upstream 1.1 branch fixes
+- Resolves: rhbz#1478451
+- Resolves: rhbz#1501505
+- Resolves: rhbz#1514492
+- Resolves: rhbz#1550829
+- Resolves: rhbz#1564536
+- Resolves: rhbz#1576148
+- Resolves: rhbz#1577300
+
+* Tue Apr 17 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.18-12
+- Pull in latest fixes from upstream 1.1 branch
+- Build for aarch64
+- Resolves: rhbz#1422602
+- Resolves: rhbz#1463015
+- Resolves: rhbz#1469255
+- Resolves: rhbz#1519379
+- Resolves: rhbz#1543278
+- Resolves: rhbz#1545449
+- Resolves: rhbz#1550829
+- Resolves: rhbz#1561617
+- Resolves: rhbz#1562255
+- Resolves: rhbz#1565187
+- Resolves: rhbz#1568593
+- Resolves: rhbz#1570130
* Fri Jan 26 2018 Ken Gaillot <kgaillot@redhat.com> - 1.1.18-11
- Fix regression in crm_master