diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-12 18:13:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-12 18:13:54 +0000 |
| commit | ce9bfca079e95c935b4a1be37a8fbb73eb025dc7 (patch) | |
| tree | 9228e2f11c32fae3c6e5022d11d0306242011bb3 /ansible | |
| parent | 87b4b3c19ffd9888a061b2cd7a3cc8e88fae1989 (diff) | |
| parent | 4bdf43c34d9e0e82817f9633b11ae93b3b74d7e0 (diff) | |
| download | kolla-ce9bfca079e95c935b4a1be37a8fbb73eb025dc7.tar.gz kolla-ce9bfca079e95c935b4a1be37a8fbb73eb025dc7.zip | |
Merge "Move transport_url parameter before service_providers section"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index e1571dc3f..c7f64dffd 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -44,13 +44,13 @@ 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 %} + {% if enable_neutron_lbaas | bool %} [service_providers] service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default {% 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 %} - [nova] auth_url = {{ keystone_admin_url }} auth_type = password |