6b5273f415
These options are set in the neutron-api charm centrally, and this patch allows neutron-openvswitch charm to continue doing: 1, polling_interval Just used by neutron l2 agents, so neutron-openvswitch charm gets it via it's relations and set it in [agent] of ml2_conf.ini or openvswitch_agent.ini(>=Mitaka) 2, rpc_response_timeout Used by all neutron agents, so both neutron-gateway charm and neutron-openvswitch charm get it via it's relations and set it in [default] of neutron.conf 3, report_interval Used by all neutron agents, so both neutron-gateway charm and neutron-openvswitch charm get it via it's relations and set it in [agent] of neutron.conf Change-Id: I76c0c75d5f3b4fdd1eb3242b53fde2e829fedca5 Partial-Bug: #1685788
44 lines
1.1 KiB
INI
44 lines
1.1 KiB
INI
# icehouse
|
|
###############################################################################
|
|
# [ WARNING ]
|
|
# Configuration file maintained by Juju. Local changes may be overwritten.
|
|
# Config managed by neutron-openvswitch charm
|
|
###############################################################################
|
|
[ml2]
|
|
type_drivers = gre,vxlan,vlan,flat
|
|
tenant_network_types = gre,vxlan,vlan,flat
|
|
mechanism_drivers = openvswitch,hyperv,l2population
|
|
|
|
[ml2_type_gre]
|
|
tunnel_id_ranges = 1:1000
|
|
|
|
[ml2_type_vxlan]
|
|
vni_ranges = 1001:2000
|
|
|
|
[ml2_type_vlan]
|
|
network_vlan_ranges = {{ vlan_ranges }}
|
|
|
|
[ml2_type_flat]
|
|
flat_networks = {{ network_providers }}
|
|
|
|
[ovs]
|
|
enable_tunneling = True
|
|
local_ip = {{ local_ip }}
|
|
bridge_mappings = {{ bridge_mappings }}
|
|
|
|
[agent]
|
|
tunnel_types = {{ overlay_network_type }}
|
|
l2_population = {{ l2_population }}
|
|
{% if veth_mtu -%}
|
|
veth_mtu = {{ veth_mtu }}
|
|
{% endif %}
|
|
polling_interval = {{ polling_interval }}
|
|
|
|
[securitygroup]
|
|
{% if neutron_security_groups -%}
|
|
enable_security_group = True
|
|
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
|
|
{% else -%}
|
|
enable_security_group = False
|
|
{% endif -%}
|