Use shared neutron template fragment.
The neutron template fragment in charmhelpers has support for metadata, so bring the pike template inline witt all the other nova.conf templates in the charm and use parts/section-neutron. Change-Id: I35514988aa9d2c289ec20dd3394846386cb1559e Closes-Bug: 1796405
This commit is contained in:
parent
6695d79c95
commit
fabc0c9dbb
|
@ -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" %}
|
||||
|
||||
|
|
Loading…
Reference in New Issue