openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "HA: fix rabbitmq readiness check for rabbitmq-server 3.8" into stable/train

This commit is contained in:
Zuul 2020-07-10 23:34:16 +00:00 committed by Gerrit Code Review
parent 1f8f4d9757 207e6d621e
commit a0725f8645
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/pacemaker/rabbitmq.pp
View File

@ -151,7 +151,7 @@ class tripleo::profile::pacemaker::rabbitmq (
# replicated around the cluster # replicated around the cluster
exec { 'rabbitmq-ready': exec { 'rabbitmq-ready':
path => '/usr/sbin:/usr/bin:/sbin:/bin', path => '/usr/sbin:/usr/bin:/sbin:/bin',
command => 'rabbitmqctl status | grep -F "{rabbit,"', command => 'rabbitmqctl eval "lists:keymember(rabbit, 1, application:which_applications())." | grep -q true',
timeout => 30, timeout => 30,
tries => 180, tries => 180,
try_sleep => 10, try_sleep => 10,

2
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@ -341,7 +341,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
} }
if size($rabbit_nodes) == 1 { if size($rabbit_nodes) == 1 {
$check_command = 'rabbitmqctl status | grep -F "{rabbit,"' $check_command = 'rabbitmqctl eval "lists:keymember(rabbit, 1, application:which_applications())." | grep -q true'
} else { } else {
# This grep makes sure the rabbit app in erlang is up and running # This grep makes sure the rabbit app in erlang is up and running
# which is enough to guarantee that the user will eventually get # which is enough to guarantee that the user will eventually get