Merge "Fix transport for kolla-kubernetes"

This commit is contained in:
Jenkins 2016-09-14 05:16:31 +00:00 committed by Gerrit Code Review
commit c960d44b74

View File

@ -44,7 +44,7 @@ max_l3_agents_per_router = {{ max_l3_agents_per_router }}
min_l3_agents_per_router = {{ min_l3_agents_per_router }} min_l3_agents_per_router = {{ min_l3_agents_per_router }}
{% endif %} {% endif %}
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% if enable_neutron_lbaas | bool %} {% if enable_neutron_lbaas | bool %}
[service_providers] [service_providers]