diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-12-17 18:11:09 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-11 18:30:32 +0000 |
| commit | 330d7fe2ee5c90c0393fb0d80674da0917e1031c (patch) | |
| tree | 007fd2876059b2908ea1f9ba2456b0adc6a3c0dc /openstack | |
| parent | 4da0073a4c46ab14949af02f5556e9d0ca083121 (diff) | |
| download | definitions-330d7fe2ee5c90c0393fb0d80674da0917e1031c.tar.gz | |
ON TEST: Enable GRE and flat and remove vlan support for ml2
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/etc/neutron/plugins/ml2/ml2_conf.ini | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini index 31928327..53d4fd1a 100644 --- a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini @@ -4,7 +4,7 @@ # # type_drivers = local,flat,vlan,gre,vxlan # Example: type_drivers = flat,vlan,gre,vxlan -type_drivers = flat,vlan +type_drivers = flat,gre # (ListOpt) Ordered list of network_types to allocate as tenant # networks. The default value 'local' is useful for single-box testing @@ -12,7 +12,7 @@ type_drivers = flat,vlan # # tenant_network_types = local # Example: tenant_network_types = vlan,gre,vxlan -tenant_network_types = vlan,flat +tenant_network_types = gre # (ListOpt) Ordered list of networking mechanism driver entrypoints # to be loaded from the neutron.ml2.mechanism_drivers namespace. @@ -47,11 +47,11 @@ flat_networks = External # # network_vlan_ranges = # Example: network_vlan_ranges = physnet1:1000:2999,physnet2 -network_vlan_ranges = Physnet1:100:200 +#network_vlan_ranges = Physnet1:100:200 [ml2_type_gre] # (ListOpt) Comma-separated list of <tun_min>:<tun_max> 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 <vni_min>:<vni_max> tuples enumerating @@ -74,7 +74,7 @@ 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 [ovs] -bridge_mappings=External:br-ex,Physnet1:br-eth1 +#bridge_mappings=External:br-ex,Physnet1:br-eth1 |