diff --git a/templates/pike/nova.conf b/templates/pike/nova.conf index aa362c5f..eb6ac557 100644 --- a/templates/pike/nova.conf +++ b/templates/pike/nova.conf @@ -126,25 +126,9 @@ volume_api_class=nova.volume.cinder.API api_servers = {{ glance_api_servers }} {% endif -%} -{% if network_manager and network_manager == 'neutron' -%} -[neutron] -url = {{ neutron_url }} -{% if auth_host -%} -auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} -auth_type = password -{% if admin_domain_name -%} -project_domain_name = {{ admin_domain_name }} -user_domain_name = {{ admin_domain_name }} -{% else -%} -project_domain_name = default -user_domain_name = default -{% endif -%} -project_name = {{ admin_tenant_name }} -username = {{ admin_user }} -password = {{ admin_password }} -signing_dir = {{ signing_dir }} -{% endif -%} -{% endif -%} +{% if network_manager and network_manager == 'neutron' %} +{% include "parts/section-neutron" %} +{% endif %} {% include "section-keystone-authtoken-mitaka" %}