openstack/puppet-nova
Code Issues Proposed changes

Don't require flat_inferface.

Browse Source 
The nova default for flat_interface is None but our puppet modules
currently require it to be set. This patch updates the network/flat
module so that it defaults to undef thus making it possible to use
nova::network w/ flat networking when no flat_interface(private_interface)
is defined.

Change-Id: I7167b76f95f3fe9a1ad208223def9597e56a4ecc
This commit is contained in:
Dan Prince 2013-05-22 14:37:40 -04:00
parent f1e12e1564
commit 8487b41c21
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network/flat.pp
View File

@ -3,8 +3,8 @@
# [flat_interface] Interface that flat network will use for bridging.
# [flat_network_bridge] Name of bridge.
class nova::network::flat (
$flat_interface,
$fixed_range,
$flat_interface=undef,
$public_interface = undef,
$flat_network_bridge = 'br100'
) {

3
spec/classes/nova_network_flat_spec.rb
View File

@ -5,7 +5,6 @@ describe 'nova::network::flat' do
describe 'with only required parameters' do
let :params do
{
:flat_interface => 'eth1',
:fixed_range => '10.0.0.0/32'
}
end
@ -14,7 +13,7 @@ describe 'nova::network::flat' do
it { should_not contain_nova_config('DEFAULT/public_interface') }
it { should contain_nova_config('DEFAULT/fixed_range').with_value('10.0.0.0/32') }
it { should contain_nova_config('DEFAULT/flat_network_bridge').with_value('br100') }
it { should contain_nova_config('DEFAULT/flat_interface').with_value('eth1') }
it { should contain_nova_config('DEFAULT/flat_interface').with_value(nil) }
end
describe 'when overriding class parameters' do