From f64eabfdf551d990f85498ff35f8bc5977c5f921 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Fri, 1 Dec 2017 17:48:58 -0500
Subject: [PATCH] Add noop's for docker pacemaker for rabbitmq

The pacemaker docker version for the rabbitmq service should also
include the noop's for the for Rabbitmq_policy and Rabbitmq_user puppet
resources that are noop'd in docker/services/rabbitmq.yaml

These resources must be noop'd in puppet, otherwise they could be
triggered during puppet apply's during the docker-puppet.py generate
config step where rabbitmqctl is not actually running.

Closes-Bug: #1735852
Change-Id: I05c6fd7e48c3d28ab28d714f25e08e43318774b7
---
 docker/services/pacemaker/rabbitmq.yaml                   | 5 ++++-
 .../notes/pacemaker-rabbitmq-b1b5fc2b47cb84e4.yaml        | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/pacemaker-rabbitmq-b1b5fc2b47cb84e4.yaml

diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml
index d9dc32a9f4..ca537f1d3e 100644
--- a/docker/services/pacemaker/rabbitmq.yaml
+++ b/docker/services/pacemaker/rabbitmq.yaml
@@ -85,7 +85,10 @@ outputs:
         config_volume: rabbitmq
         puppet_tags: file
         step_config:
-          get_attr: [RabbitmqBase, role_data, step_config]
+          list_join:
+            - "\n"
+            - - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
+              - get_attr: [RabbitmqBase, role_data, step_config]
         config_image: {get_param: DockerRabbitmqConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
diff --git a/releasenotes/notes/pacemaker-rabbitmq-b1b5fc2b47cb84e4.yaml b/releasenotes/notes/pacemaker-rabbitmq-b1b5fc2b47cb84e4.yaml
new file mode 100644
index 0000000000..531a9daaf7
--- /dev/null
+++ b/releasenotes/notes/pacemaker-rabbitmq-b1b5fc2b47cb84e4.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  -- The pacemaker docker version for the rabbitmq service should also
+     include the noop's for the for Rabbitmq_policy and Rabbitmq_user puppet
+     resources that are noop'd in docker/services/rabbitmq.yaml These resources
+     must be noop'd in puppet, otherwise they could be triggered during puppet
+     apply's during the docker-puppet.py generate config step where rabbitmqctl
+     is not actually running.