diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 05:16:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 05:16:31 +0000 |
| commit | c960d44b74e114b3631e125288b547e76b36cecd (patch) | |
| tree | a9ce85ac721c4be01612bdffc3ccde165b5b61bf | |
| parent | ba32530faca434c0ef7ca3290b9bf17825342694 (diff) | |
| parent | 5e3f392d5bf0ad82a508b7c668f6f3b9b6475a04 (diff) | |
| download | kolla-c960d44b74e114b3631e125288b547e76b36cecd.tar.gz kolla-c960d44b74e114b3631e125288b547e76b36cecd.zip | |
Merge "Fix transport for kolla-kubernetes"
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index b233cf0a4..87dfb4729 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -44,7 +44,7 @@ max_l3_agents_per_router = {{ max_l3_agents_per_router }} min_l3_agents_per_router = {{ min_l3_agents_per_router }} {% 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 %} [service_providers] |