From: James Slagle <jslagle@redhat.com>
Date: Wed, 22 Mar 2017 21:58:29 +0000 (-0400)
Subject: Check rabbitmq user at step >= 2
X-Git-Tag: opnfv-6.0.0~290^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aa9af086f05e466e88ac2a85ecc9d39f5a6d1e2f;p=apex-puppet-tripleo.git

Check rabbitmq user at step >= 2

The rabbitmq user check is moved to step >= 2 from step >= 1. There is
no gaurantee that rabbitmq is running at step 1, especially if updating
a failed stack that never made it past step 1 to begin with.

Change-Id: I029193da4c180deff3ab516bc8dc2da14c279317
Closes-Bug: #1675194
---

diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index b04d721..329101b 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -160,6 +160,9 @@ class tripleo::profile::base::rabbitmq (
         ssl_key                 => $tls_keyfile,
       }
     }
+  }
+
+  if $step >= 2 {
     # In case of HA, starting of rabbitmq-server is managed by pacemaker, because of which, a dependency
     # to Service['rabbitmq-server'] will not work. Sticking with UPDATE action.
     if $stack_action == 'UPDATE' {
diff --git a/manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml b/manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml
new file mode 100644
index 0000000..e1caf4c
--- /dev/null
+++ b/manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - The rabbitmq user check is moved to step >= 2 from step >= 1. There
+    is no gaurantee that rabbitmq is running at step 1, especially if
+    updating a failed stack that never made it past step 1 to begin
+    with.