openstack/charm-neutron-gateway
Code Issues Proposed changes

Fix juno templates

Browse Source
This commit is contained in:
Liam Young 2015-03-26 10:49:09 +00:00
parent ada6593a09
commit 5bfe69f4d2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/juno/ml2_conf.ini
View File

@ -14,20 +14,23 @@ tunnel_id_ranges = 1:1000
vni_ranges = 1001:2000 vni_ranges = 1001:2000
[ml2_type_vlan] [ml2_type_vlan]
network_vlan_ranges = physnet1:1000:2000 network_vlan_ranges = {{ vlan_ranges }}
[ml2_type_flat] [ml2_type_flat]
flat_networks = physnet1 flat_networks = {{ network_providers }}
[ovs] [ovs]
enable_tunneling = True enable_tunneling = True
local_ip = {{ local_ip }} local_ip = {{ local_ip }}
bridge_mappings = physnet1:br-data bridge_mappings = {{ bridge_mappings }}
[agent] [agent]
tunnel_types = {{ overlay_network_type }} tunnel_types = {{ overlay_network_type }}
l2_population = {{ l2_population }} l2_population = {{ l2_population }}
enable_distributed_routing = {{ enable_dvr }} enable_distributed_routing = {{ enable_dvr }}
{% if veth_mtu -%}
veth_mtu = {{ veth_mtu }}
{% endif %}
[securitygroup] [securitygroup]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver