diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-28 05:58:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-28 05:58:00 +0000 |
| commit | 5d0e96e85251fb813dfd94ebfcdb7c1c7f9df8d2 (patch) | |
| tree | e0d36b3907df6e752a7d8332214c7aa60e68562f /manifests | |
| parent | 87d65b003af09b00bdd7b4a214ad265dd4bb29bb (diff) | |
| parent | aa9af086f05e466e88ac2a85ecc9d39f5a6d1e2f (diff) | |
Merge "Check rabbitmq user at step >= 2"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/rabbitmq.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/releasenotes/notes/rabbitmq-user-check-95da891a2e197d89.yaml | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp index 6def08b..9d1417c 100644 --- a/manifests/profile/base/rabbitmq.pp +++ b/manifests/profile/base/rabbitmq.pp @@ -150,6 +150,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' { 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. |