stackforge/puppet-openstack
Code Issues Proposed changes

Merge pull request #43 from sorenh/master

Browse Source 
Fix a few issues I stumbled upon
This commit is contained in:
Dan Bode
2012-05-10 07:09:44 -07:00
parent d84820346c 3e419bc834
commit 9e6b2156fd
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute.pp
View File

@@ -17,7 +17,6 @@ class openstack::compute(
$fixed_range = '10.0.0.0/16', $fixed_range = '10.0.0.0/16',
$network_manager = 'nova.network.manager.FlatDHCPManager', $network_manager = 'nova.network.manager.FlatDHCPManager',
$multi_host = false, $multi_host = false,
$network_host = false,
$network_config = {}, $network_config = {},
# my address # my address
# conection information # conection information
@@ -39,6 +38,7 @@ class openstack::compute(
rabbit_userid => $rabbit_user, rabbit_userid => $rabbit_user,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
rabbit_host => $rabbit_host,
glance_api_servers => $glance_api_servers, glance_api_servers => $glance_api_servers,
verbose => $verbose, verbose => $verbose,
} }
@@ -74,12 +74,8 @@ class openstack::compute(
} }
} else { } else {
$enable_network_service = false $enable_network_service = false
if ! $network_host {
fail('network_host must be defined for non multi host compute nodes')
}
nova_config { nova_config {
'multi_host': value => 'False'; 'multi_host': value => 'False';
'network_host': value => $network_host;
} }
} }

2
manifests/controller.pp
View File

@@ -39,7 +39,7 @@ class openstack::controller(
$network_config = {}, $network_config = {},
# I do not think that this needs a bridge? # I do not think that this needs a bridge?
$verbose = false, $verbose = false,
$export_resource = false $export_resources = true
) { ) {
$glance_api_servers = "${internal_address}:9292" $glance_api_servers = "${internal_address}:9292"