openstack/kolla-ansible
Code Issues Proposed changes

Merge "Avoid _ in rabbitmq_clusterer.config"

Browse Source
This commit is contained in:
Jenkins 2016-05-15 17:36:18 +00:00 committed by Gerrit Code Review
commit 4b2233a2e7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/rabbitmq/tasks/config.yml
View File

@ -21,4 +21,4 @@
with_items: with_items:
- "rabbitmq-env.conf" - "rabbitmq-env.conf"
- "rabbitmq.config" - "rabbitmq.config"
- "rabbitmq_clusterer.config" - "rabbitmq-clusterer.config"

0
ansible/roles/rabbitmq/templates/rabbitmq_clusterer.config.j2 → ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2
View File

2
ansible/roles/rabbitmq/templates/rabbitmq.config.j2
View File

@ -18,6 +18,6 @@
{port, {{ rabbitmq_management_port }}} {port, {{ rabbitmq_management_port }}}
]} ]}
]}, ]},
{rabbitmq_clusterer, [{config, "/etc/rabbitmq/rabbitmq_clusterer.config"}]} {rabbitmq_clusterer, [{config, "/etc/rabbitmq/rabbitmq-clusterer.config"}]}
]. ].
% EOF % EOF

4
ansible/roles/rabbitmq/templates/rabbitmq.json.j2
View File

@ -14,8 +14,8 @@
"perm": "0600" "perm": "0600"
}, },
{ {
"source": "{{ container_config_directory }}/rabbitmq_clusterer.config", "source": "{{ container_config_directory }}/rabbitmq-clusterer.config",
"dest": "/etc/rabbitmq/rabbitmq_clusterer.config", "dest": "/etc/rabbitmq/rabbitmq-clusterer.config",
"owner": "rabbitmq", "owner": "rabbitmq",
"perm": "0600" "perm": "0600"
} }