Merge "Fix unable to connect to epmd when deploy rabbitmq by train with ipv6"

This commit is contained in:
Zuul 2019-12-23 14:43:48 +00:00 committed by Gerrit Code Review
commit a94ab43f18
3 changed files with 34 additions and 0 deletions

View File

@ -363,5 +363,26 @@
- item.key != "kolla-toolbox"
with_dict: "{{ common_services }}"
- name: Copy rabbitmq-env.conf to kolla toolbox
copy:
content: |
RABBITMQ_CTL_ERL_ARGS="-proto_dist inet6_tcp"
export ERL_INETRC=/etc/rabbitmq/erl_inetrc
dest: /etc/kolla/kolla-toolbox/rabbitmq-env.conf
mode: "0600"
become: true
when:
api_address_family == "ipv6"
- name: Copy rabbitmq erl_intr to kolla toolbox
copy:
content: |
{inet6,true}.
dest: /etc/kolla/kolla-toolbox/erl_inetrc
mode: "0600"
become: true
when:
api_address_family == "ipv6"
- include_tasks: check-containers.yml
when: kolla_action != "config"

View File

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

View File

@ -7,3 +7,4 @@ RABBITMQ_CTL_ERL_ARGS="{% if api_address_family == 'ipv6' %}-proto_dist inet6_tc
export ERL_EPMD_ADDRESS={{ api_interface_address }}
export ERL_EPMD_PORT={{ role_rabbitmq_epmd_port }}
export ERL_INETRC=/etc/rabbitmq/erl_inetrc