From 2a734381fc9ff3f1e1e369d20f2bd4fdb62c1237 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Jul 2018 18:14:38 +0200
Subject: [PATCH] Enable deep_compare of pcmk resources by default

By settings these hiera keys we will actually do a deep comparison
of all pacemaker resources and update them accordingly.

This means that rerunning a deploy against an existing overcloud
will actually detect if a pacemaker resource needs updating and
will update the definition and restart of said resource. The code
will wait for the resource to be up (aka the cluster to settle
after an update).

Related-Bug: #1823849

Depends-On: I62d5662327333e17e1c32a029695b3d3a904ca10
Change-Id: I0b9ed429e6b1bd4a62b4462bf6312782f29b7d6b
(cherry picked from commit 60d75f19e5165d784d0d46c6addb81fe4a8b2876)
---
 puppet/services/pacemaker.yaml                            | 3 +++
 .../update-pcmk-resource-by-default-ed54100721f55a30.yaml | 8 ++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/update-pcmk-resource-by-default-ed54100721f55a30.yaml

diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 3e88415f1b..f524622dc9 100644
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -115,6 +115,9 @@ outputs:
           resource-stickiness: { value: INFINITY }
         corosync_token_timeout: 10000
         pacemaker::corosync::settle_tries: {get_param: CorosyncSettleTries}
+        pacemaker::resource::bundle::deep_compare: true
+        pacemaker::resource::ip::deep_compare: true
+        pacemaker::resource::ocf::deep_compare: true
         tripleo.pacemaker.firewall_rules:
           '130 pacemaker tcp':
             proto: 'tcp'
diff --git a/releasenotes/notes/update-pcmk-resource-by-default-ed54100721f55a30.yaml b/releasenotes/notes/update-pcmk-resource-by-default-ed54100721f55a30.yaml
new file mode 100644
index 0000000000..808058c947
--- /dev/null
+++ b/releasenotes/notes/update-pcmk-resource-by-default-ed54100721f55a30.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Historically if a puppet definition for a pacemaker resource did change
+    puppet would not update it. We now enable the updating of pacemaker resources
+    by default. The main use case being restarting a bundle when a bind mount gets
+    added. Puppet will wait for the resource to completely restart before
+    proceeding with the deploy.