diff --git a/hooks/neutron_api_context.py b/hooks/neutron_api_context.py index b9eeb4c8..f5282a9e 100644 --- a/hooks/neutron_api_context.py +++ b/hooks/neutron_api_context.py @@ -290,6 +290,10 @@ class NeutronApiSDNContext(context.SubordinateConfigContext): 'templ_key': 'restart_trigger', 'value': '', }, + 'quota-driver': { + 'templ_key': 'quota_driver', + 'value': '', + }, } for rid in relation_ids('neutron-plugin-api-subordinate'): for unit in related_units(rid): diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf index 0132c279..4ef069c7 100644 --- a/templates/icehouse/neutron.conf +++ b/templates/icehouse/neutron.conf @@ -69,7 +69,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0 {% endif %} [quotas] +{% if quota_driver -%} +quota_driver = {{ quota_driver }} +{% else -%} quota_driver = neutron.db.quota_db.DbQuotaDriver +{% endif -%} {% if neutron_security_groups -%} quota_items = network,subnet,port,security_group,security_group_rule quota_security_group = {{ quota_security_group }} diff --git a/templates/juno/neutron.conf b/templates/juno/neutron.conf index a8b545b1..d5ed593d 100644 --- a/templates/juno/neutron.conf +++ b/templates/juno/neutron.conf @@ -69,7 +69,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0 {% endif %} [quotas] +{% if quota_driver -%} +quota_driver = {{ quota_driver }} +{% else -%} quota_driver = neutron.db.quota_db.DbQuotaDriver +{% endif -%} {% if neutron_security_groups -%} quota_items = network,subnet,port,security_group,security_group_rule {% endif -%} diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf index 7e85bf31..b03b3e0f 100644 --- a/templates/kilo/neutron.conf +++ b/templates/kilo/neutron.conf @@ -73,7 +73,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0 {% include "section-zeromq" %} [quotas] +{% if quota_driver -%} +quota_driver = {{ quota_driver }} +{% else -%} quota_driver = neutron.db.quota_db.DbQuotaDriver +{% endif -%} {% if neutron_security_groups -%} quota_items = network,subnet,port,security_group,security_group_rule quota_security_group = {{ quota_security_group }} diff --git a/templates/liberty/neutron.conf b/templates/liberty/neutron.conf index b548ed9b..4a15e5f9 100644 --- a/templates/liberty/neutron.conf +++ b/templates/liberty/neutron.conf @@ -73,7 +73,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0 {% include "section-zeromq" %} [quotas] +{% if quota_driver -%} +quota_driver = {{ quota_driver }} +{% else -%} quota_driver = neutron.db.quota_db.DbQuotaDriver +{% endif -%} {% if neutron_security_groups -%} quota_items = network,subnet,port,security_group,security_group_rule quota_security_group = {{ quota_security_group }}