openstack/puppet-nova
Code Issues Proposed changes

Merge "Create networks only if nova-network is enabled"

Browse Source
This commit is contained in:
Jenkins
2015-12-03 15:30:13 +00:00
committed by Gerrit Code Review
parent 052b203539 f9ff60e66a
commit 6ea0cd8fb4
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/network.pp
View File

@@ -141,22 +141,28 @@ class nova::network(
ensure_package => $ensure_package,
before => Exec['networking-refresh']
}
}
if $create_networks {
nova::manage::network { 'nova-vm-net':
network => $fixed_range,
num_networks => $num_networks,
network_size => $network_size,
vlan_start => $vlan_start,
allowed_start => $allowed_start,
allowed_end => $allowed_end,
dns1 => $dns1,
dns2 => $dns2,
}
if $floating_range {
nova::manage::floating { 'nova-vm-floating':
network => $floating_range,
# because nova_network provider uses nova client, so it assumes
# that nova-network service is running already
if $create_networks {
if $enabled {
nova::manage::network { 'nova-vm-net':
network => $fixed_range,
num_networks => $num_networks,
network_size => $network_size,
vlan_start => $vlan_start,
allowed_start => $allowed_start,
allowed_end => $allowed_end,
dns1 => $dns1,
dns2 => $dns2,
}
if $floating_range {
nova::manage::floating { 'nova-vm-floating':
network => $floating_range,
}
}
} else {
warning('Can not create networks, when nova-network service is disabled.')
}
}
}

9
spec/classes/nova_network_spec.rb
View File

@@ -96,6 +96,15 @@ describe 'nova::network' do
it { is_expected.to contain_nova__manage__floating('nova-vm-floating').with_network('10.0.0.0/30') }
end
end
describe 'when creating networks, but service nova-network is disabled' do
let :params do
default_params.merge(:enabled => false)
end
it { is_expected.to_not contain_nova__manage__network('nova-vm-net') }
it { is_expected.to_not contain_nova__manage__floating('nova-vm-floating') }
end
describe 'when configuring networks' do
describe 'when configuring flatdhcpmanager' do
let :params do