summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-03-22 17:58:29 -0400
committerJames Slagle <jslagle@redhat.com>2017-03-22 18:01:39 -0400
commitaa9af086f05e466e88ac2a85ecc9d39f5a6d1e2f (patch)
treebe48adc1f11a1bd961003acec1f283b831283b50 /manifests/profile/base
parent02f5102eeb2600068c7561b156bf00a8eeed5bd0 (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
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/rabbitmq.pp3
1 files changed, 3 insertions, 0 deletions
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' {