stackforge/puppet-openstack
Code Issues Proposed changes

Merge pull request #50 from bodepd/minor_changes

Browse Source 
Minor changes
This commit is contained in:
Dan Bode
2012-05-22 13:26:15 -07:00
parent a335d0bc39 6e8f566cde
commit 0a67b507cd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/all.pp
View File

@@ -9,7 +9,7 @@ class openstack::all(
$public_interface, $public_interface,
$private_interface, $private_interface,
$floating_range = false, $floating_range = false,
$fixed_range = '10.0.0.0/16', $fixed_range = '10.0.0.0/24',
$network_manager = 'nova.network.manager.FlatDHCPManager', $network_manager = 'nova.network.manager.FlatDHCPManager',
$network_config = {}, $network_config = {},
# middleware credentials # middleware credentials
@@ -26,7 +26,7 @@ class openstack::all(
$glance_db_password = 'glance_pass', $glance_db_password = 'glance_pass',
$glance_user_password = 'glance_pass', $glance_user_password = 'glance_pass',
# config # config
$verbose = true, $verbose = false,
$purge_nova_config = true, $purge_nova_config = true,
$libvirt_type = 'kvm' $libvirt_type = 'kvm'
) { ) {
@@ -144,6 +144,7 @@ class openstack::all(
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => '127.0.0.1:9292', glance_api_servers => '127.0.0.1:9292',
verbose => $verbose,
} }
class { 'nova::api': class { 'nova::api':
@@ -192,6 +193,10 @@ class openstack::all(
vncserver_listen => '127.0.0.1', vncserver_listen => '127.0.0.1',
} }
class { 'nova::volume::iscsi':
iscsi_ip_address => '127.0.0.1',
}
# nova::network::bridge { 'br100': # nova::network::bridge { 'br100':
# ip => '11.0.0.1', # ip => '11.0.0.1',
# netmask => '255.255.255.0', # netmask => '255.255.255.0',