Skip to content
Snippets Groups Projects
Commit ce9bfca0 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Move transport_url parameter before service_providers section"

parents 87b4b3c1 4bdf43c3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/neutron/templates/neutron.conf.j2
+ 2
− 2
View file @ ce9bfca0
...@@ -44,13 +44,13 @@ max_l3_agents_per_router = {{ max_l3_agents_per_router }} ...@@ -44,13 +44,13 @@ 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 %}
{% if enable_neutron_lbaas | bool %} {% if enable_neutron_lbaas | bool %}
[service_providers] [service_providers]
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
{% 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 %}
[nova] [nova]
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment