← Back to branch summary

~corey.bryant/charms/trusty/neutron-openvswitch/git

« back to all changes in this revision

Viewing changes to templates/icehouse/ml2_conf.ini

  • Committer: james.page at ubuntu
  • Date: 2015-03-19 17:00:09 UTC
  • mfrom: (42.2.42 neutron-openvswitch)
  • Revision ID: james.page@ubuntu.com-20150319170009-p59jnhxs6mfyce9n
[dosaboy,r=james-page] Support mtu from neutron-api, add support for bridge mapping configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/icehouse/ml2_conf.ini
16
16
vni_ranges = 1001:2000
17
17
 
18
18
[ml2_type_vlan]
19
 
network_vlan_ranges = physnet1:1000:2000
 
19
network_vlan_ranges = {{ vlan_ranges }}
20
20
 
21
21
[ml2_type_flat]
22
 
flat_networks = physnet1
 
22
flat_networks = {{ network_providers }}
23
23
 
24
24
[ovs]
25
25
enable_tunneling = True
26
26
local_ip = {{ local_ip }}
27
 
bridge_mappings = physnet1:br-data
 
27
bridge_mappings = {{ bridge_mappings }}
28
28
 
29
29
[agent]
30
30
tunnel_types = {{ overlay_network_type }}
31
31
l2_population = {{ l2_population }}
 
32
{% if veth_mtu -%}
 
33
veth_mtu = {{ veth_mtu }}
 
34
{% endif %}
32
35
 
33
36
[securitygroup]
34
37
{% if neutron_security_groups -%}