x/packstack
Code Issues Proposed changes

Merge "Remove nova-network workarounds"

Browse Source
This commit is contained in:
Jenkins
2016-01-26 19:00:16 +00:00
committed by Gerrit Code Review
parent dfe39696e2 037fd8783d
commit d220fc0c93
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,7 @@
$auto_assign_floating_ip = hiera('CONFIG_NOVA_NETWORK_AUTOASSIGNFLOATINGIP')
nova_config {
'DEFAULT/auto_assign_floating_ip': value => $auto_assign_floating_ip;
}
$multihost = hiera('CONFIG_NOVA_NETWORK_MULTIHOST') $multihost = hiera('CONFIG_NOVA_NETWORK_MULTIHOST')
if $multihost { if $multihost {
nova_config { nova_config {
'DEFAULT/multi_host': value => true;
'DEFAULT/send_arp_for_ha': value => true; 'DEFAULT/send_arp_for_ha': value => true;
} }
} }
@@ -39,15 +32,17 @@ $nova_network_privif = hiera('CONFIG_NOVA_NETWORK_PRIVIF')
$nova_network_pubif = hiera('CONFIG_NOVA_NETWORK_PUBIF') $nova_network_pubif = hiera('CONFIG_NOVA_NETWORK_PUBIF')
class { '::nova::network': class { '::nova::network':
enabled => true, enabled => true,
network_manager => $manager, network_manager => $manager,
num_networks => $net_num , num_networks => $net_num ,
network_size => $net_size, network_size => $net_size,
private_interface => force_interface($nova_network_privif, $use_subnets), private_interface => force_interface($nova_network_privif, $use_subnets),
public_interface => force_interface($nova_network_pubif, $use_subnets), public_interface => force_interface($nova_network_pubif, $use_subnets),
fixed_range => hiera('CONFIG_NOVA_NETWORK_FIXEDRANGE'), fixed_range => hiera('CONFIG_NOVA_NETWORK_FIXEDRANGE'),
floating_range => hiera('CONFIG_NOVA_NETWORK_FLOATRANGE'), floating_range => hiera('CONFIG_NOVA_NETWORK_FLOATRANGE'),
config_overrides => $overrides, config_overrides => $overrides,
auto_assign_floating_ip => hiera('CONFIG_NOVA_NETWORK_AUTOASSIGNFLOATINGIP'),
multi_host => $multihost
} }
package { 'dnsmasq': package { 'dnsmasq':