openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Enable additional ml2_conf.ini configuration"

This commit is contained in:
Jenkins 2014-06-13 12:23:14 +00:00 committed by Gerrit Code Review
parent 1952eaa466 35765345f0
commit eb13ffa83f
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini
View File

@ -1,6 +1,11 @@
[ml2]
type_drivers = local,flat,vlan,gre,vxlan
{{#neutron.mechanism_drivers}}
mechanism_drivers = {{neutron.mechanism_drivers}}
{{/neutron.mechanism_drivers}}
{{^neutron.mechanism_drivers}}
mechanism_drivers = openvswitch
{{/neutron.mechanism_drivers}}
tenant_network_types = {{neutron.ovs.tenant_network_type}}
[ml2_type_flat]
@ -14,7 +19,12 @@ flat_networks={{neutron.flat-networks}}
tunnel_id_ranges = 1:1000
[ml2_type_vxlan]
{{#neutron.vni_ranges}}
vni_ranges = {{neutron.vni_ranges}}
{{/neutron.vni_ranges}}
{{^neutron.vni_ranges}}
vni_ranges = 1001:2000
{{/neutron.vni_ranges}}
[database]
connection = {{neutron.ovs_db}}
@ -27,3 +37,13 @@ root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
[securitygroup]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
{{#ml2}}
{{#config}}
{{#comment}} repeats for each section {{/comment}}
[{{section}}]
{{#values}}
{{option}}={{value}}
{{/values}}
{{/config}}
{{/ml2}}