Fix kolla-toolbox with IPv6 and disabled RabbitMQ

Closes-Bug: #1939883
Change-Id: Ica311acba445cccac1d20757ced6f15a064ebcaa
This commit is contained in:
Radosław Piliszek 2021-08-13 12:47:41 +00:00
parent 85879afc0b
commit 13200ace33
3 changed files with 10 additions and 2 deletions

View File

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

View File

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