Merge "Fix kolla-toolbox with IPv6 and disabled RabbitMQ"

ansible/roles/common/tasks/config.yml

@@ -284,6 +284,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
@@ -295,4 +296,5 @@
   become: true
   when:
     - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
+    - enable_rabbitmq | bool
     - api_address_family == "ipv6"

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

@@ -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": [
         {

releasenotes/notes/bug-1939883-dbfca874b138cfe9.yaml

@@ -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>`__