openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Wires up neutron tunnel_id_ranges and vni_ranges for config"

This commit is contained in:
Jenkins 2015-10-16 17:41:39 +00:00 committed by Gerrit Code Review
parent 83e824c31f 698a1bb7d7
commit db2e67016c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,15 +17,20 @@ flat_networks={{neutron.flat-networks}}
network_vlan_ranges = {{neutron.ovs.network_vlan_ranges}}
[ml2_type_gre]
{{#neutron.ovs.tunnel_id_ranges}}
tunnel_id_ranges = {{neutron.ovs.tunnel_id_ranges}}
{{/neutron.ovs.tunnel_id_ranges}}
{{^neutron.ovs.tunnel_id_ranges}}
tunnel_id_ranges = 1:1000
{{/neutron.ovs.tunnel_id_ranges}}
[ml2_type_vxlan]
{{#neutron.vni_ranges}}
vni_ranges = {{neutron.vni_ranges}}
{{/neutron.vni_ranges}}
{{^neutron.vni_ranges}}
vni_ranges = 1001:2000
{{/neutron.vni_ranges}}
{{#neutron.ovs.vni_ranges}}
vni_ranges = {{neutron.ovs.vni_ranges}}
{{/neutron.ovs.vni_ranges}}
{{^neutron.ovs.vni_ranges}}
vni_ranges = 1:1000
{{/neutron.ovs.vni_ranges}}
[database]
{{#neutron.ovs_db}}