x/packstack
Code Issues Proposed changes

Fix demo bridge setup

Browse Source 
For cases where no network host is the same host as controller host
bridge<->subnet binding fails because there is no br-ex on controller.

Change-Id: Ie0761af0d9e91c5e17b3c8ecd09d1d7a0c2a0ed0
This commit is contained in:
Martin Mágr
2015-08-19 09:19:54 +02:00
committed by Lukas Bezdicka
parent 3015bff80d
commit 38e23465a7
7 changed files with 70 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packstack/puppet/templates/provision_tempest.pp
View File

@@ -33,8 +33,6 @@ if $provision_tempest_user != '' {
$private_subnet_name = 'private_subnet'
$fixed_range = '10.0.0.0/24'
$router_name = 'router1'
$setup_ovs_bridge = hiera('CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE')
$public_bridge_name = hiera('CONFIG_NEUTRON_L3_EXT_BRIDGE')
## Tempest
$configure_tempest = hiera('CONFIG_PROVISION_TEMPEST')
@@ -149,13 +147,6 @@ if $provision_tempest_user != '' {
neutron_router_interface { "${router_name}:${private_subnet_name}":
ensure => present,
}
if $setup_ovs_bridge {
neutron_l3_ovs_bridge { $public_bridge_name:
ensure => present,
subnet_name => $public_subnet_name,
}
}
}
## Tempest
@@ -193,31 +184,6 @@ if $provision_tempest_user != '' {
require => $tempest_requires,
}
}
if hiera('CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE') {
firewall { '000 nat':
chain => 'POSTROUTING',
jump => 'MASQUERADE',
source => hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE'),
outiface => $::gateway_device,
table => 'nat',
proto => 'all',
}
firewall { '000 forward out':
chain => 'FORWARD',
action => 'accept',
outiface => hiera('CONFIG_NEUTRON_L3_EXT_BRIDGE'),
proto => 'all',
}
firewall { '000 forward in':
chain => 'FORWARD',
action => 'accept',
iniface => hiera('CONFIG_NEUTRON_L3_EXT_BRIDGE'),
proto => 'all',
}
}
} else {
## Standalone Tempest installation
class { '::tempest':