stackforge/kickstack
Code Issues Proposed changes

Quantum: remove bridge mappings and fix bridge uplinks for GRE configurations

Browse Source
This commit is contained in:
Florian Haas 2013-07-19 12:12:07 +00:00
parent ae0892a089
commit 9815cdf7b9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,10 @@ class kickstack::quantum::agent::l2 inherits kickstack {
case $tenant_network_type { case $tenant_network_type {
'gre': { 'gre': {
$local_tunnel_ip = getvar("ipaddress_${nic_data}") $local_tunnel_ip = getvar("ipaddress_${nic_data}")
$bridge_uplinks = ["${::kickstack::quantum_external_bridge}:${nic_external}"]
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':
bridge_mappings => [],
bridge_uplinks => $bridge_uplinks,
integration_bridge => $::kickstack::quantum_integration_bridge, integration_bridge => $::kickstack::quantum_integration_bridge,
enable_tunneling => true, enable_tunneling => true,
local_ip => $local_tunnel_ip, local_ip => $local_tunnel_ip,