Put quantum/neutron_url under if loop

This commit is contained in:
Ante Karamatic 2014-01-31 17:26:01 +01:00
parent f531a60ce1
commit 4c1f154655

@ -73,8 +73,8 @@ default_floating_pool = {{ external_network }}
{% if network_manager and network_manager == 'quantum' -%}
network_api_class = nova.network.quantumv2.api.API
quantum_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
{% if auth_host -%}
quantum_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
quantum_auth_strategy = keystone
quantum_admin_tenant_name = {{ admin_tenant_name }}
quantum_admin_username = {{ admin_user }}
@ -83,8 +83,8 @@ quantum_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v
{% endif -%}
{% elif network_manager and network_manager == 'neutron' -%}
network_api_class = nova.network.neutronv2.api.API
neutron_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
{% if auth_host -%}
neutron_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
neutron_auth_strategy = keystone
neutron_admin_tenant_name = {{ admin_tenant_name }}
neutron_admin_username = {{ admin_user }}