Skip to content

Commit 257e6e4

Browse files
committed
Fix kolla-toolbox with IPv6 and disabled RabbitMQ
Closes-Bug: #1939883 Change-Id: Ica311acba445cccac1d20757ced6f15a064ebcaa (cherry picked from commit 13200ac)
1 parent c7d77ff commit 257e6e4

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

ansible/roles/common/tasks/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@
277277
become: true
278278
when:
279279
- common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
280+
- enable_rabbitmq | bool
280281
- api_address_family == "ipv6"
281282

282283
- name: Copy rabbitmq erl_intr to kolla toolbox
@@ -288,4 +289,5 @@
288289
become: true
289290
when:
290291
- common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
292+
- enable_rabbitmq | bool
291293
- api_address_family == "ipv6"

ansible/roles/common/templates/kolla-toolbox.json.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dest": "/var/lib/rabbitmq/.erlang.cookie",
77
"owner": "rabbitmq",
88
"perm": "0600"
9-
}{% endif %}{% if api_address_family == 'ipv6' %},
9+
}{% if api_address_family == 'ipv6' %},
1010
{
1111
"source": "{{ container_config_directory }}/rabbitmq-env.conf",
1212
"dest": "/etc/rabbitmq/rabbitmq-env.conf",
@@ -18,7 +18,7 @@
1818
"dest": "/etc/rabbitmq/erl_inetrc",
1919
"owner": "rabbitmq",
2020
"perm": "0600"
21-
}{% endif %}
21+
}{% endif %}{% endif %}
2222
],
2323
"permissions": [
2424
{
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixed broken ``kolla-toolbox`` container when RabbitMQ is disabled and
5+
IPv6 is used.
6+
`LP#1939883 <https://launchpad.net/bugs/1939883>`__

0 commit comments

Comments
 (0)