aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-03-22 17:58:29 -0400
committerSaravanan KR <skramaja@redhat.com>2017-03-30 10:12:55 +0000
commitb6a9d14489608e4c3ff48d602351a7b93092b11b (patch)
tree8b2bff1c61a44006274b887af7377b3105c47c3e
parentdc5be83acb3a1f13830651188e0cec4e5056dfc0 (diff)
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 (cherry picked from commit aa9af086f05e466e88ac2a85ecc9d39f5a6d1e2f)
-rw-r--r--manifests/profile/base/rabbitmq.pp3
-rw-r--r--manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml6
2 files changed, 9 insertions, 0 deletions
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 1eaabf0..71d08f0 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -118,6 +118,9 @@ class tripleo::profile::base::rabbitmq (
environment_variables => $rabbit_env,
}
}
+ }
+
+ 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.