openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Remove stack_update check in rabbit manifest"

This commit is contained in:
Zuul 2021-10-14 04:37:30 +00:00 committed by Gerrit Code Review
parent f979093234 9b4212e29e
commit 7741a3d64f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,21 +260,16 @@ class tripleo::profile::base::rabbitmq (
}
if $rabbitmq_bootstrapnode and $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.
# When need to enforce the rabbitmq user inside a bootstrap node check for two reasons:
# a) on HA the users get replicated by the cluster anyway
# b) in the pacemaker profiles for rabbitmq we have an Exec['rabbitmq-ready'] -> Rabbitmq_User<||> collector
# which is applied only on the bootstrap node (because enforcing the readiness on all nodes can be problematic
# in situations like controller replacement)
if $stack_action == 'UPDATE' {
# Required for changing password on update scenario. Password will be changed only when
# called explicity, if the rabbitmq service is already running.
rabbitmq_user { $rabbitmq_user :
password => $rabbitmq_pass,
admin => true,
}
# Required for changing password on update scenario. Password will be changed only when
# called explicity, THT enforces that the rabbitmq service is already running when we call this.
rabbitmq_user { $rabbitmq_user :
password => $rabbitmq_pass,
admin => true,
}
}
}