openstack
/
openstack-ansible-rabbitmq_server
Code Issues Proposed changes

Remove clustering config from rabbitmq.config 

Remove cluster formation configuration from rabbitmq.config. Cluster
formation is managed by the task files in the role, see
tasks/rabbitmq_cluster.yml for details. The entries in the config
template are unnecessary and I believe they may be causing clustering
failures when the clustering tasks run.

Remove testing for cluster configuration in rabbitmq.config.

Change-Id: Ia65da05a5c967965143e8167657688d6906ad1f0
This commit is contained in:
git-harry 2016-03-29 12:03:02 +01:00
parent 0399c19b56
commit cadd8ff635
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/rabbitmq.config.j2
View File

@ -10,9 +10,6 @@
{versions, ['tlsv1.2', 'tlsv1.1']},
{verify,verify_none},
{fail_if_no_peer_cert,false}]},
{% if rabbitmq_cluster_partition_handling != 'ignore' %}{cluster_partition_handling, {{ rabbitmq_cluster_partition_handling }}},{% endif %}
{cluster_nodes, {
[ {% for host in groups['rabbitmq_all'] %}'rabbit@{{ hostvars[host]['ansible_ssh_host'] }}'{% if not loop.last %}, {% endif %}{% endfor %}], disc}
}
{% if rabbitmq_cluster_partition_handling != 'ignore' %}{cluster_partition_handling, {{ rabbitmq_cluster_partition_handling }}}{% endif %}
]}
].

3
tests/test-functional.yml
View File

@ -47,9 +47,6 @@
assert:
that:
- "'rabbitmq_management' in enabled_plugins_contents"
- "'rabbit@10.100.100.101' in rabbitmq_config_contents"
- "'rabbit@10.100.100.102' in rabbitmq_config_contents"
- "'rabbit@10.100.100.103' in rabbitmq_config_contents"
- name: Get status of rabbitmq
command: rabbitmqctl status
register: rabbitmqctl_status