x/packstack
Code Issues Proposed changes

Merge "Added posibility to change Nova network manager."

Browse Source
This commit is contained in:
Jenkins
2013-09-04 06:37:37 +00:00
committed by Gerrit Code Review
parent 9234dd31c4 abad6c23ae
commit 98139fa406
2 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packstack/puppet/templates/nova_network.pp
View File

@@ -3,14 +3,30 @@ nova_config{
"DEFAULT/auto_assign_floating_ip": value => '%(CONFIG_NOVA_NETWORK_AUTOASSIGNFLOATINGIP)s';
}
$manager = '%(CONFIG_NOVA_NETWORK_MANAGER)s'
$overrides = {}
if $manager in ['nova.network.manager.VlanManager', 'nova.network.manager.FlatDHCPManager'] {
$overrides['force_dhcp_release'] = false
}
if $manager == 'nova.network.manager.VlanManager' {
$overrides['vlan_start'] = '%(CONFIG_NOVA_NETWORK_VLAN_START)s'
$net_size = '%(CONFIG_NOVA_NETWORK_SIZE)s'
$net_num = '%(CONFIG_NOVA_NETWORK_NUMBER)s'
} else {
$net_size = '%(CONFIG_NOVA_NETWORK_FIXEDSIZE)s'
$net_num = 1
}
class {"nova::network":
enabled => true,
network_manager => $manager,
num_networks => $net_num ,
network_size => $net_size,
private_interface => '%(CONFIG_NOVA_NETWORK_PRIVIF)s',
public_interface => '%(CONFIG_NOVA_NETWORK_PUBIF)s',
fixed_range => '%(CONFIG_NOVA_NETWORK_FIXEDRANGE)s',
network_size => '%(CONFIG_NOVA_NETWORK_FIXEDSIZE)s',
floating_range => '%(CONFIG_NOVA_NETWORK_FLOATRANGE)s',
config_overrides => {force_dhcp_release => false}
config_overrides => $overrides,
}
package { 'dnsmasq': ensure => present }