openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Check rabbitmq user at step >= 2" into stable/newton

This commit is contained in:
Jenkins 2017-04-03 22:25:04 +00:00 committed by Gerrit Code Review
parent 3735d0c109 9849454264
commit 4c58f1d48b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/profile/base/rabbitmq.pp
View File

@ -106,6 +106,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' {

6
manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml Normal file
View File

@ -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.