openstack/charm-neutron-api
Code Issues Proposed changes

Support quota-driver attribute in neutron-plugin-api-subordinate relation

Browse Source
This commit is contained in:
Robert Ayres 2015-10-07 23:11:33 +01:00
parent 2f1e962cf9
commit 74f927b621
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/neutron_api_context.py
View File

@ -290,6 +290,10 @@ class NeutronApiSDNContext(context.SubordinateConfigContext):
'templ_key': 'restart_trigger', 'templ_key': 'restart_trigger',
'value': '', 'value': '',
}, },
'quota-driver': {
'templ_key': 'quota_driver',
'value': '',
},
} }
for rid in relation_ids('neutron-plugin-api-subordinate'): for rid in relation_ids('neutron-plugin-api-subordinate'):
for unit in related_units(rid): for unit in related_units(rid):

4
templates/icehouse/neutron.conf
View File

@ -69,7 +69,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif %} {% endif %}
[quotas] [quotas]
{% if quota_driver -%}
quota_driver = {{ quota_driver }}
{% else -%}
quota_driver = neutron.db.quota_db.DbQuotaDriver quota_driver = neutron.db.quota_db.DbQuotaDriver
{% endif -%}
{% if neutron_security_groups -%} {% if neutron_security_groups -%}
quota_items = network,subnet,port,security_group,security_group_rule quota_items = network,subnet,port,security_group,security_group_rule
quota_security_group = {{ quota_security_group }} quota_security_group = {{ quota_security_group }}

4
templates/juno/neutron.conf
View File

@ -69,7 +69,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif %} {% endif %}
[quotas] [quotas]
{% if quota_driver -%}
quota_driver = {{ quota_driver }}
{% else -%}
quota_driver = neutron.db.quota_db.DbQuotaDriver quota_driver = neutron.db.quota_db.DbQuotaDriver
{% endif -%}
{% if neutron_security_groups -%} {% if neutron_security_groups -%}
quota_items = network,subnet,port,security_group,security_group_rule quota_items = network,subnet,port,security_group,security_group_rule
{% endif -%} {% endif -%}

4
templates/kilo/neutron.conf
View File

@ -73,7 +73,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% include "section-zeromq" %} {% include "section-zeromq" %}
[quotas] [quotas]
{% if quota_driver -%}
quota_driver = {{ quota_driver }}
{% else -%}
quota_driver = neutron.db.quota_db.DbQuotaDriver quota_driver = neutron.db.quota_db.DbQuotaDriver
{% endif -%}
{% if neutron_security_groups -%} {% if neutron_security_groups -%}
quota_items = network,subnet,port,security_group,security_group_rule quota_items = network,subnet,port,security_group,security_group_rule
quota_security_group = {{ quota_security_group }} quota_security_group = {{ quota_security_group }}

4
templates/liberty/neutron.conf
View File

@ -73,7 +73,11 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% include "section-zeromq" %} {% include "section-zeromq" %}
[quotas] [quotas]
{% if quota_driver -%}
quota_driver = {{ quota_driver }}
{% else -%}
quota_driver = neutron.db.quota_db.DbQuotaDriver quota_driver = neutron.db.quota_db.DbQuotaDriver
{% endif -%}
{% if neutron_security_groups -%} {% if neutron_security_groups -%}
quota_items = network,subnet,port,security_group,security_group_rule quota_items = network,subnet,port,security_group,security_group_rule
quota_security_group = {{ quota_security_group }} quota_security_group = {{ quota_security_group }}