Tidy signing_dirs, add DB context for neutron/quantum configuration

This commit is contained in:
James Page 2013-09-25 11:43:33 +01:00
parent 56c717745e
commit 4ae986dfce
3 changed files with 11 additions and 5 deletions

@ -89,7 +89,10 @@ BASE_RESOURCE_MAP = OrderedDict([
'contexts': [context.AMQPContext(),
nova_cc_context.HAProxyContext(),
nova_cc_context.IdentityServiceContext(),
nova_cc_context.NeutronCCContext()],
nova_cc_context.NeutronCCContext(),
context.SharedDBContext(user=config('neutron-database-user'),
database=config('neutron-database'),
relation_prefix='neutron')],
}),
('/etc/quantum/api-paste.ini', {
'services': ['quantum-server'],
@ -100,7 +103,10 @@ BASE_RESOURCE_MAP = OrderedDict([
'contexts': [context.AMQPContext(),
nova_cc_context.IdentityServiceContext(),
nova_cc_context.NeutronCCContext(),
nova_cc_context.HAProxyContext()],
nova_cc_context.HAProxyContext(),
context.SharedDBContext(user=config('neutron-database-user'),
database=config('neutron-database'),
relation_prefix='neutron')],
}),
('/etc/haproxy/haproxy.cfg', {
'contexts': [context.HAProxyContext(),

@ -23,7 +23,7 @@ rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% endif -%}
[quotas]
quota_driver = quantum.db.quota_db.DbQuotaDriver
quota_driver = neutron.db.quota_db.DbQuotaDriver
{% if neutron_security_groups -%}
quota_items = network,subnet,port,security_group,security_group_rule
{% endif -%}
@ -43,7 +43,7 @@ auth_protocol = {{ auth_protocol }}
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}
signing_dir = /var/lib/cinder
signing_dir = $state_path/keystone-signing
{% endif -%}
[database]

@ -23,5 +23,5 @@ auth_protocol = {{ auth_protocol }}
admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }}
admin_password = {{ admin_password }}
signing_dir = /var/lib/neutron
signing_dir = $state_path/keystone-signing
{% endif -%}