openstack/charm-neutron-api
Code Issues Proposed changes

Switch to using charm-helper templates for keystone authtoken

Browse Source
This commit is contained in:
James Page 2015-03-25 09:25:45 +00:00
parent 43fa7c4a37
commit cd8e53b09b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/kilo/neutron.conf
View File

@ -65,15 +65,7 @@ quota_floatingip = {{ quota_floatingip }}
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
{% if auth_host -%}
[keystone_authtoken]
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/{{ auth_admin_prefix }}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/{{ service_admin_prefix }}
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}
signing_dir = {{ signing_dir }}
{% endif -%}
{% include "section-keystone-authtoken" %}
{% include "parts/section-database" %}