From 8e6921b91ab6ac81325e898308d24c504ee54ea2 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 19 May 2015 15:00:52 +0000 Subject: Neutron: add back the custom configuration Add back the custom configuration for Neutron, this time adapted for the OpenStack Kilo release. --- .../openstack/neutron/plugins/ml2/ml2_conf.ini | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini') diff --git a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini index ac9a3d0d..3258a40f 100644 --- a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini +++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini @@ -2,19 +2,19 @@ # (ListOpt) List of network type driver entrypoints to be loaded from # the neutron.ml2.type_drivers namespace. # -# type_drivers = local,flat,vlan,gre,vxlan +type_drivers = flat,gre # Example: type_drivers = flat,vlan,gre,vxlan # (ListOpt) Ordered list of network_types to allocate as tenant # networks. The default value 'local' is useful for single-box testing # but provides no connectivity between hosts. # -# tenant_network_types = local +tenant_network_types = gre # Example: tenant_network_types = vlan,gre,vxlan # (ListOpt) Ordered list of networking mechanism driver entrypoints # to be loaded from the neutron.ml2.mechanism_drivers namespace. -# mechanism_drivers = +mechanism_drivers = openvswitch # Example: mechanism_drivers = openvswitch,mlnx # Example: mechanism_drivers = arista # Example: mechanism_drivers = cisco,logger @@ -63,7 +63,7 @@ # can be created. Use * to allow flat networks with arbitrary # physical_network names. # -# flat_networks = +flat_networks = External # Example:flat_networks = physnet1,physnet2 # Example:flat_networks = * @@ -78,7 +78,7 @@ [ml2_type_gre] # (ListOpt) Comma-separated list of : tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation -# tunnel_id_ranges = +tunnel_id_ranges = 1:1000 [ml2_type_vxlan] # (ListOpt) Comma-separated list of : tuples enumerating @@ -96,8 +96,18 @@ [securitygroup] # Controls if neutron security group is enabled or not. # It should be false when you use nova security group. -# enable_security_group = True +enable_security_group = True # Use ipset to speed-up the iptables security groups. Enabling ipset support # requires that ipset is installed on L2 agent node. -# enable_ipset = True +enable_ipset = True + +firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver + +[ovs] +local_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }} +enable_tunneling = True +bridge_mappings=External:br-ex + +[agent] +tunnel_types = gre -- cgit v1.2.1