From a55dfe1dd7985041ff32381495fe093ecaef2549 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 11 Feb 2014 10:47:27 +0100 Subject: [PATCH] network: Ensure OVS is well configured No unit tests because it's a temp fix. Close bug #199 Signed-off-by: Emilien Macchi --- manifests/network.pp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/manifests/network.pp b/manifests/network.pp index 438a3dca..673913ed 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -100,4 +100,19 @@ class cloud::network( enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' } + # TODO(EmilienM) Temporary, need to be fixed upstream. + # There is an issue when using ML2 + OVS: neutron services don't read OVS + # config file, only ML2. I need to patch puppet-neutron. + # Follow-up: https://github.com/enovance/puppet-cloud/issues/199 + neutron_plugin_ml2 { + 'agent/tunnel_types': value => ['gre']; + 'agent/l2_population': value => true; + 'agent/polling_interval': value => '2'; + 'OVS/local_ip': value => $tunnel_eth; + 'OVS/enable_tunneling': value => true; + 'OVS/integration_bridge': value => 'br-int'; + 'OVS/tunnel_bridge': value => 'br-tun'; + 'OVS/bridge_mappings': value => $provider_bridge_mappings; + } + }