(#598) Improve rabbitmq clustering robustness #742
Conversation
jeffmccune
force-pushed
the
598_fix_rabbitmq_cluster
branch
from
9feab34
to
7f1edd9
Compare
jeffmccune
changed the title
|
Thanks @jeffmccune Looks good. Please rebase for a clean merge. |
jeffmccune
force-pushed
the
598_fix_rabbitmq_cluster
branch
from
7f1edd9
to
c3366cb
Compare
Thanks! Change has been rebased, Vagrantfile resolved and clean. |
|
Merged some of your other work first and it caused a merge conflict. Could you please rebase again for me and I'll merge this next. |
|
Will rebase shortly. |
Without this patch, Puppet errors out when both `sensu::rabbitmq_password`, or
any of the `sensu::rabbitmq_*` parameters are specified along with
`sensu::rabbitmq_cluster`. The error is:
Error: /Stage[main]/Sensu::Rabbitmq::Config/Sensu_rabbitmq_config[sensu-server.example.com]: Could not evaluate: no implicit conversion of String into Integer
/vagrant/lib/puppet/provider/sensu_rabbitmq_config/json.rb:137:in `[]'
/vagrant/lib/puppet/provider/sensu_rabbitmq_config/json.rb:137:in `password'
This patch addresses the problem by changing sensu::rabbitmq::config to ignore
sensu::rabbitmq_* class parameters when the cluster configuration is specified
via `sensu::rabbitmq_cluster`.
Resolves sensu#598
jeffmccune
force-pushed
the
598_fix_rabbitmq_cluster
branch
from
c3366cb
to
516e798
Compare
|
Rebased. |
|
Released in v2.24.0 |
|
Thanks for fixing this! I can confirm that I can run puppet now without it failing. However, I did notice that puppet doesn't seem to manage the sensu-api service anymore with this change. I tried putting a block into my manifest, but then I got a duplicate resource declaration error. I even tried putting manage_services => true (although it is by default), and it still wont start the sensu-api service. I tried stopping the sensu-enterprise service, and puppet did restart it, so I think it's only ignoring the sensu-api service for some reason. |
|
I believe the sensu-api service is not meant to run when using sensu-enterprise as it provides its own API service. |
|
You're right. I figured out why I was running into issues and created a pull request to fix the problem: |
|
Thanks @csoleimani ! |
Without this patch, Puppet errors out when both
sensu::rabbitmq_password, orany of the
sensu::rabbitmq_*parameters are specified along withsensu::rabbitmq_cluster. The error is:This patch addresses the problem by changing sensu::rabbitmq::config to ignore
sensu::rabbitmq_* class parameters when the cluster configuration is specified
via
sensu::rabbitmq_cluster.Resolves #598