summaryrefslogtreecommitdiff
path: root/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-27 12:45:08 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-27 12:45:08 +0000
commite6de0454599f2e9cb4ea69a9d9fdab32eae0fa3f (patch)
tree8647a967fb531d30310466f94e6b5a1b9ead5ee9 /openstack/etc/neutron/plugins/ml2/ml2_conf.ini
parent6c0832decc7f3ac2ef059d9f55951d21678b3f42 (diff)
downloaddefinitions-e6de0454599f2e9cb4ea69a9d9fdab32eae0fa3f.tar.gz
Fix neutron, nova and glance configuration
Diffstat (limited to 'openstack/etc/neutron/plugins/ml2/ml2_conf.ini')
-rw-r--r--openstack/etc/neutron/plugins/ml2/ml2_conf.ini7
1 files changed, 6 insertions, 1 deletions
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
index c493a7bb..fb4d7a9f 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
@@ -67,7 +67,7 @@ tunnel_id_ranges = 1:1000
# Example: vxlan_group = 239.1.1.1
[securitygroup]
-firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
# Controls if neutron security group is enabled or not.
# It should be false when you use nova security group.
enable_security_group = True
@@ -77,4 +77,9 @@ enable_security_group = True
enable_ipset = True
[ovs]
+local_ip = 127.0.0.1
+enable_tunneling = True
bridge_mappings=External:br-ex,Physnet1:br-eth1
+
+[agent]
+tunnel_types = gre