stackforge/kickstack
Code Issues Proposed changes

Add external bridge

Browse Source
This commit is contained in:
Florian Haas 2013-07-16 11:57:44 +00:00
parent 2615718f34
commit 8f6dc22186
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/quantum/agent/l2.pp
View File

@ -10,17 +10,17 @@ class kickstack::quantum::agent::l2 inherits kickstack {
'gre': { 'gre': {
$local_tunnel_ip = getvar("ipaddress_${nic_data}") $local_tunnel_ip = getvar("ipaddress_${nic_data}")
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':
integration_bridge => 'br-int', integration_bridge => $::kickstack::quantum_integration_bridge,
enable_tunneling => true, enable_tunneling => true,
local_ip => $local_tunnel_ip, local_ip => $local_tunnel_ip,
tunnel_bridge => 'br-tun', tunnel_bridge => $::kickstack::quantum_tunnel_bridge,
} }
} }
default: { default: {
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':
bridge_mappings => ["${::kickstack::quantum_physnet}:br-${nic_data}"], bridge_mappings => ["${::kickstack::quantum_physnet}:br-${nic_data}"],
bridge_uplinks => ["br-${nic_data}:${nic_data}"], bridge_uplinks => ["br-${nic_data}:${nic_data}","${::kickstack::quantum_external_bridge}:${nic_external}"],
integration_bridge => 'br-int', integration_bridge => $::kickstack::quantum_integation_bridge,
enable_tunneling => false, enable_tunneling => false,
local_ip => '', local_ip => '',
} }

7
manifests/quantum/agent/l3.pp
View File

@ -2,12 +2,17 @@ class kickstack::quantum::agent::l3 inherits kickstack {
include kickstack::quantum::config include kickstack::quantum::config
class { "vswitch::bridge":
name => 'br-ex'
}
class { "::quantum::agents::l3": class { "::quantum::agents::l3":
debug => $::kickstack::debug, debug => $::kickstack::debug,
interface_driver => $::kickstack::quantum_plugin ? { interface_driver => $::kickstack::quantum_plugin ? {
'ovs' => 'quantum.agent.linux.interface.OVSInterfaceDriver', 'ovs' => 'quantum.agent.linux.interface.OVSInterfaceDriver',
'linuxbridge' => 'quantum.agent.linux.interface.BridgeInterfaceDriver' 'linuxbridge' => 'quantum.agent.linux.interface.BridgeInterfaceDriver'
}, },
external_network_bridge => $::kickstack::quantum_external_bridge,
use_namespaces => $::kickstack::quantum_network_type ? { use_namespaces => $::kickstack::quantum_network_type ? {
'per-tenant-router' => true, 'per-tenant-router' => true,
default => false default => false
@ -20,6 +25,6 @@ class kickstack::quantum::agent::l3 inherits kickstack {
'provider-router' => "$::kickstack::quantum_gateway_external_network_id", 'provider-router' => "$::kickstack::quantum_gateway_external_network_id",
default => undef default => undef
}, },
require => Class['kickstack::quantum::agent::metadata'] require => Class['kickstack::quantum::agent::metadata','vswitch::bridge']
} }
} }