diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2016-05-12 13:59:57 -0400 |
|---|---|---|
| committer | Davanum Srinivas <davanum@gmail.com> | 2016-05-13 07:39:12 -0400 |
| commit | 48b4b158286c4490117c2abfd07c700208e36663 (patch) | |
| tree | 8eac5ed1725a9460dbee4e91ba4fde00e59e5c99 | |
| parent | 0977601ea5d90ff5d3579ea2b4f97330fe5e3e76 (diff) | |
| download | kolla-48b4b158286c4490117c2abfd07c700208e36663.tar.gz kolla-48b4b158286c4490117c2abfd07c700208e36663.zip | |
Avoid _ in rabbitmq_clusterer.config
Trying to use ConfigMap's in Kubernetes leads to an interesting
problem. We use the file name as the key and the contents of the
file as the text value. The ConfigMap is mounted on the container
as a volume and the key is then used as the name of the file. The
problem is that kubernetes has a limitation on the name of the
key
https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/identifiers.md
Which means we cannot use '_' in the name of the file.
Closes-Bug: #1581162
Change-Id: I2d9ec80f989c30893b019954fe18b3623d27a076
| -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" } |