diff options
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 10 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 | 1 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.config.j2 | 8 | ||||
| -rw-r--r-- | etc/kolla/defaults.yml | 5 |
4 files changed, 18 insertions, 6 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index f01ac268e..6f4c685f9 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -29,11 +29,15 @@ listen mariadb listen rabbitmq mode tcp option tcpka + bind {{ kolla_internal_address }}:{{ rabbitmq_port }} +{% for host in groups['rabbitmq'] %} + server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rabbitmq_port }} check inter 2000 rise 2 fall 5 +{% endfor %} - # TODO(SamYaple): Make rabbitmq port configurable throughout Ansible - bind {{ kolla_internal_address }}:5672 +listen rabbitmq_management + bind {{ kolla_internal_address }}:{{ rabbitmq_management_port }} {% for host in groups['rabbitmq'] %} - server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:5672 check inter 2000 rise 2 fall 5 + server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rabbitmq_management_port }} check inter 2000 rise 2 fall 5 {% endfor %} listen keystone_public diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 index 555f94dc1..a62cac893 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 @@ -1,2 +1,3 @@ RABBITMQ_NODENAME=rabbit export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} +export ERL_EPMD_PORT={{ rabbitmq_epmd_port }} diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 index 787d63ae6..d12b7f271 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 @@ -1,10 +1,12 @@ [ {kernel, [ - {inet_dist_use_interface, {% raw %}{{% endraw %}{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] | regex_replace('\.', ',') }}}} + {inet_dist_use_interface, {% raw %}{{% endraw %}{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] | regex_replace('\.', ',') }}}}, + {inet_dist_listen_min, {{ rabbitmq_cluster_port }}}, + {inet_dist_listen_max, {{ rabbitmq_cluster_port }}} ]}, {rabbit, [ {tcp_listeners, [ - {"{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}", 5672} + {"{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}", {{ rabbitmq_port }}} ]}, {default_user, <<"{{ rabbitmq_user }}">>}, {default_pass, <<"{{ rabbitmq_password }}">>}, @@ -17,7 +19,7 @@ {rabbitmq_management, [ {listener, [ {ip, "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"}, - {port, 15672} + {port, {{ rabbitmq_management_port }}} ]} ]} ]. diff --git a/etc/kolla/defaults.yml b/etc/kolla/defaults.yml index ad04c8617..b4dbe7dda 100644 --- a/etc/kolla/defaults.yml +++ b/etc/kolla/defaults.yml @@ -23,6 +23,11 @@ node_config_directory: "/opt/kolla/config" # the different services. This prevents setting the ports in the defaults for # each role. +rabbitmq_port: "5672" +rabbitmq_management_port: "15672" +rabbitmq_cluster_port: "25672" +rabbitmq_epmd_port: "4369" + keystone_public_port: "5000" keystone_admin_port: "35357" |