diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-15 17:36:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-15 17:36:18 +0000 |
| commit | 4b2233a2e7d4abded1dba1d893f1d137cc459342 (patch) | |
| tree | 947631a13bf501983056e60a9119c1d89b461dc1 | |
| parent | 27580054dbaa1249c2aacd817487a62e9c1a7cb3 (diff) | |
| parent | 48b4b158286c4490117c2abfd07c700208e36663 (diff) | |
| download | kolla-4b2233a2e7d4abded1dba1d893f1d137cc459342.tar.gz kolla-4b2233a2e7d4abded1dba1d893f1d137cc459342.zip | |
Merge "Avoid _ in rabbitmq_clusterer.config"
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/config.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2 (renamed from ansible/roles/rabbitmq/templates/rabbitmq_clusterer.config.j2) | 0 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.config.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.json.j2 | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml index f0f6144a9..28b29ea97 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -21,4 +21,4 @@ with_items: - "rabbitmq-env.conf" - "rabbitmq.config" - - "rabbitmq_clusterer.config" + - "rabbitmq-clusterer.config" diff --git a/ansible/roles/rabbitmq/templates/rabbitmq_clusterer.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2 index a50ce84ea..a50ce84ea 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq_clusterer.config.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq-clusterer.config.j2 diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 index 213a32453..50c931ef4 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 @@ -18,6 +18,6 @@ {port, {{ rabbitmq_management_port }}} ]} ]}, - {rabbitmq_clusterer, [{config, "/etc/rabbitmq/rabbitmq_clusterer.config"}]} + {rabbitmq_clusterer, [{config, "/etc/rabbitmq/rabbitmq-clusterer.config"}]} ]. % EOF diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 index 82d7ad0bb..9aef3c691 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 @@ -14,8 +14,8 @@ "perm": "0600" }, { - "source": "{{ container_config_directory }}/rabbitmq_clusterer.config", - "dest": "/etc/rabbitmq/rabbitmq_clusterer.config", + "source": "{{ container_config_directory }}/rabbitmq-clusterer.config", + "dest": "/etc/rabbitmq/rabbitmq-clusterer.config", "owner": "rabbitmq", "perm": "0600" } |