Fix kolla-toolbox with IPv6 and disabled RabbitMQ

Closes-Bug: #1939883
Change-Id: Ica311acba445cccac1d20757ced6f15a064ebcaa
(cherry picked from commit 13200ace33)
This commit is contained in:
Radosław Piliszek 2021-08-13 12:47:41 +00:00
parent 8692c315a9
commit a42d09d464
3 changed files with 10 additions and 2 deletions

View File

@ -275,6 +275,7 @@
become: true
when:
- common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
- enable_rabbitmq | bool
- api_address_family == "ipv6"
- name: Copy rabbitmq erl_intr to kolla toolbox
@ -286,4 +287,5 @@
become: true
when:
- common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
- enable_rabbitmq | bool
- api_address_family == "ipv6"

View File

@ -6,7 +6,7 @@
"dest": "/var/lib/rabbitmq/.erlang.cookie",
"owner": "rabbitmq",
"perm": "0600"
}{% endif %}{% if api_address_family == 'ipv6' %},
}{% if api_address_family == 'ipv6' %},
{
"source": "{{ container_config_directory }}/rabbitmq-env.conf",
"dest": "/etc/rabbitmq/rabbitmq-env.conf",
@ -18,7 +18,7 @@
"dest": "/etc/rabbitmq/erl_inetrc",
"owner": "rabbitmq",
"perm": "0600"
}{% endif %}
}{% endif %}{% endif %}
],
"permissions": [
{

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixed broken ``kolla-toolbox`` container when RabbitMQ is disabled and
IPv6 is used.
`LP#1939883 <https://launchpad.net/bugs/1939883>`__