openstack/kolla
Code Issues Proposed changes

Merge "Update rabbitmq confs and ports"

Browse Source
This commit is contained in:
Jenkins 2015-08-12 20:22:30 +00:00 committed by Gerrit Code Review
commit 15041bd4cc
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -29,11 +29,15 @@ listen mariadb
listen rabbitmq listen rabbitmq
mode tcp mode tcp
option tcpka option tcpka
bind {{ kolla_internal_address }}:{{ rabbitmq_port }}
# TODO(SamYaple): Make rabbitmq port configurable throughout Ansible
bind {{ kolla_internal_address }}:5672
{% for host in groups['rabbitmq'] %} {% 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_port }} check inter 2000 rise 2 fall 5
{% endfor %}
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'] }}:{{ rabbitmq_management_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% endfor %}
listen keystone_public listen keystone_public

1
ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
View File

@ -1,2 +1,3 @@
RABBITMQ_NODENAME=rabbit RABBITMQ_NODENAME=rabbit
export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
export ERL_EPMD_PORT={{ rabbitmq_epmd_port }}

8
ansible/roles/rabbitmq/templates/rabbitmq.config.j2
View File

@ -1,10 +1,12 @@
[ [
{kernel, [ {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, [ {rabbit, [
{tcp_listeners, [ {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_user, <<"{{ rabbitmq_user }}">>},
{default_pass, <<"{{ rabbitmq_password }}">>}, {default_pass, <<"{{ rabbitmq_password }}">>},
@ -17,7 +19,7 @@
{rabbitmq_management, [ {rabbitmq_management, [
{listener, [ {listener, [
{ip, "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"}, {ip, "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"},
{port, 15672} {port, {{ rabbitmq_management_port }}}
]} ]}
]} ]}
]. ].

5
etc/kolla/defaults.yml
View File

@ -23,6 +23,11 @@ node_config_directory: "/opt/kolla/config"
# the different services. This prevents setting the ports in the defaults for # the different services. This prevents setting the ports in the defaults for
# each role. # each role.
rabbitmq_port: "5672"
rabbitmq_management_port: "15672"
rabbitmq_cluster_port: "25672"
rabbitmq_epmd_port: "4369"
keystone_public_port: "5000" keystone_public_port: "5000"
keystone_admin_port: "35357" keystone_admin_port: "35357"