openstack/puppet-nova
Code Issues Proposed changes

vlan fixes

Browse Source
This commit is contained in:
Joe Topjian 2012-10-24 10:18:02 -06:00
parent bf8254ddc3
commit e75da4220b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/manage/network.pp
View File

@ -9,7 +9,8 @@ define nova::manage::network (
$network, $network,
$num_networks = 1, $num_networks = 1,
$network_size = 255, $network_size = 255,
$project = undef $vlan_start = undef,
$project = undef
) { ) {
File['/etc/nova/nova.conf'] -> Nova_network[$name] File['/etc/nova/nova.conf'] -> Nova_network[$name]
@ -21,6 +22,7 @@ define nova::manage::network (
num_networks => $num_networks, num_networks => $num_networks,
network_size => $network_size, network_size => $network_size,
project => $project, project => $project,
vlan_start => $vlan_start,
} }
} }

7
manifests/network.pp
View File

@ -43,6 +43,12 @@ class nova::network(
nova_config { 'floating_range': value => $floating_range } nova_config { 'floating_range': value => $floating_range }
} }
if has_key($config_overrides, 'vlan_start') {
$vlan_start = $config_overrides['vlan_start']
} else {
$vlan_start = undef
}
if $install_service { if $install_service {
nova::generic_service { 'network': nova::generic_service { 'network':
enabled => $enabled, enabled => $enabled,
@ -58,6 +64,7 @@ class nova::network(
network => $fixed_range, network => $fixed_range,
num_networks => $num_networks, num_networks => $num_networks,
network_size => $network_size, network_size => $network_size,
vlan_start => $vlan_start,
} }
if $floating_range { if $floating_range {
nova::manage::floating { 'nova-vm-floating': nova::manage::floating { 'nova-vm-floating':