stackforge/kickstack
Code Issues Proposed changes

Neutron: Ensure that L3 agent is configured before L2 agent on network node

Browse Source 
Strangely, the L2 agent relies on the availability of
bridge_uplinks. The corresponding bridges are only created by the L3
agent. Hence, on the network node only, make sure we have L3 set up
before we tackle L2.
This commit is contained in:
Florian Haas 2013-10-16 21:10:35 +02:00
parent 008824d157
commit f7a499a660
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/neutron/agent/l2/network.pp
View File

@ -14,7 +14,9 @@ class kickstack::neutron::agent::l2::network inherits kickstack {
# The neutron module creates bridge_uplinks only when
# bridge_mappings is non-empty. That's bogus for GRE
# configurations, so create the uplink anyway.
::neutron::plugins::ovs::port { "$bridge_uplinks": }
::neutron::plugins::ovs::port { "$bridge_uplinks":
require => Class['kickstack::neutron::agent::l3'],
}
class { 'neutron::agents::ovs':
bridge_mappings => [],
bridge_uplinks => [],
@ -22,7 +24,7 @@ class kickstack::neutron::agent::l2::network inherits kickstack {
enable_tunneling => true,
local_ip => $local_tunnel_ip,
tunnel_bridge => $::kickstack::neutron_tunnel_bridge,
require => Neutron::Plugins::Ovs::Port["$bridge_uplinks"]
require => Neutron::Plugins::Ovs::Port["$bridge_uplinks"],
package_ensure => $::kickstack::package_version,
}
}