openstack/charm-neutron-api
Code Issues Proposed changes

[hopem,r=gnuoy]

Browse Source 
Implement PKI token signing.

Closes-Bug: 1309667
This commit is contained in:
Edward Hope-Morley 2015-03-13 12:59:38 +00:00
commit 3f424c79bd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_api_utils.py
View File

@ -77,7 +77,9 @@ BASE_RESOURCE_MAP = OrderedDict([
database=config('database'),
ssl_dir=NEUTRON_CONF_DIR),
context.PostgresqlDBContext(database=config('database')),
neutron_api_context.IdentityServiceContext(),
neutron_api_context.IdentityServiceContext(
service='neutron',
service_user='neutron'),
neutron_api_context.NeutronCCContext(),
context.SyslogContext(),
context.BindHostContext(),

2
templates/icehouse/neutron.conf
View File

@ -69,7 +69,7 @@ quota_floatingip = {{ quota_floatingip }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
[keystone_authtoken]
signing_dir = /var/lib/neutron/keystone-signing
signing_dir = {{ signing_dir }}
{% if service_host -%}
service_protocol = {{ service_protocol }}
service_host = {{ service_host }}

2
templates/kilo/neutron.conf
View File

@ -69,7 +69,7 @@ quota_floatingip = {{ quota_floatingip }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
[keystone_authtoken]
signing_dir = /var/lib/neutron/keystone-signing
signing_dir = {{ signing_dir }}
{% if service_host -%}
service_protocol = {{ service_protocol }}
service_host = {{ service_host }}