[ivoks] Use default hostname and port for neutron API access

This commit is contained in:
James Page 2014-02-03 16:07:06 +02:00
commit 9a30181c5b

@ -74,7 +74,6 @@ default_floating_pool = {{ external_network }}
{% if network_manager and network_manager == 'quantum' -%}
network_api_class = nova.network.quantumv2.api.API
{% 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 }}
@ -84,7 +83,6 @@ quantum_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v
{% elif network_manager and network_manager == 'neutron' -%}
network_api_class = nova.network.neutronv2.api.API
{% 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 }}