openstack/charm-neutron-api
Code Issues Proposed changes

Add ability to except subordinate config in icehouse and juno. Other fixes from jamespages review comments

Browse Source
This commit is contained in:
Liam Young 2015-07-29 11:13:49 +01:00
parent c8c7beb1e3
commit 9d88d29605
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -360,4 +360,4 @@ options:
default: True
description: |
If True neutron-server will install neutron packages for the plugin
stipulated.
configured.

6
templates/icehouse/neutron.conf
View File

@ -54,6 +54,12 @@ nova_admin_password = {{ admin_password }}
nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif -%}
{% if sections and 'DEFAULT' in sections -%}
{% for key, value in sections['DEFAULT'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
[quotas]
quota_driver = neutron.db.quota_db.DbQuotaDriver
{% if neutron_security_groups -%}

6
templates/juno/neutron.conf
View File

@ -54,6 +54,12 @@ nova_admin_password = {{ admin_password }}
nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif -%}
{% if sections and 'DEFAULT' in sections -%}
{% for key, value in sections['DEFAULT'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
[quotas]
quota_driver = neutron.db.quota_db.DbQuotaDriver
{% if neutron_security_groups -%}

20
templates/kilo/neutron.conf
View File

@ -83,11 +83,6 @@ quota_member = {{ quota_member }}
quota_health_monitors = {{ quota_health_monitors }}
quota_router = {{ quota_router }}
quota_floatingip = {{ quota_floatingip }}
{% if sections and 'quotas' in sections -%}
{% for key, value in sections['quotas'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
@ -97,26 +92,11 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
{% include "parts/section-database" %}
{% include "section-rabbitmq-oslo" %}
{% if sections and 'agent' in sections -%}
{% for key, value in sections['agent'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
[service_providers]
service_provider=LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
service_provider=FIREWALL:Iptables:neutron_fwaas.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default
{% if sections and 'service_providers' in sections -%}
{% for key, value in sections['service_providers'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
[oslo_concurrency]
lock_path = $state_path/lock
{% if sections and 'oslo_concurrency' in sections -%}
{% for key, value in sections['oslo_concurrency'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif %}