openstack
/
puppet-nova
Code Issues Proposed changes

Style changes to network manifests. 

consistent spacing
declare instead of inherit
This commit is contained in:
Dan Bode 2011-06-15 16:01:33 -07:00
parent 9b504bda71
commit 3006e0f88b
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/manifests/network/flat.pp
View File

@ -1,8 +1,14 @@
# flatdhcp.pp
class nova::network::flat ( $flat_network_bridge,
$flat_network_bridge_ip,
$flat_network_bridge_netmask,
$enabled = "true" ) inherits nova::network {
class nova::network::flat (
$flat_network_bridge,
$flat_network_bridge_ip,
$flat_network_bridge_netmask,
$enabled = "true"
) {
class { 'nova::network':
enabled => $enabled,
}
nova_config {
'network_manager': value => 'nova.network.manager.FlatManager';

22
nova/manifests/network/flatdhcp.pp
View File

@ -1,12 +1,18 @@
# flatdhcp.pp
class nova::network::flatdhcp ( $public_interface,
$flat_interface,
$flat_dhcp_start,
$flat_injected = 'false',
$dhcpbridge = '/usr/bin/nova-dhcpbridge',
$dhcpbridge_flagfile='/etc/nova/nova.conf',
$enabled = 'true' ) inherits nova::network {
# we only need to setup configuration, nova does the rest
class nova::network::flatdhcp (
$public_interface,
$flat_interface,
$flat_dhcp_start,
$flat_injected = 'false',
$dhcpbridge = '/usr/bin/nova-dhcpbridge',
$dhcpbridge_flagfile='/etc/nova/nova.conf',
$enabled = 'true'
) {
# we only need to setup configuration, nova does the rest
class { 'nova::network':
enabled => $enabled,
}
nova_config {
'network_manage': value => 'nova.network.manager.FlatDHCPManager';
'public_interface': value => $public_interface;