stackforge/puppet-openstack
Code Issues Proposed changes

Always create nova class

Browse Source 
This commit removes the defined statement that was
used for conditionally creating the nova class
in openstack::nova::compute.

This usage of ! defined introduced ordering issues
that would make it extremely difficult to understand
how nova would be configured.
This commit is contained in:
Dan Bode
2012-08-19 00:40:47 -07:00
parent 4e2684090f
commit afafbd355f
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/nova/compute.pp
View File

@@ -69,17 +69,14 @@ class openstack::nova::compute (
$glance_connection = $glance_api_servers $glance_connection = $glance_api_servers
$rabbit_connection = $rabbit_host $rabbit_connection = $rabbit_host
# Configure Nova
if ! defined( Class[nova] ) {
class { 'nova': class { 'nova':
sql_connection => $final_sql_connection, sql_connection => $sql_connection,
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',
glance_api_servers => $glance_connection, glance_api_servers => $glance_api_servers,
verbose => $verbose, verbose => $verbose,
rabbit_host => $rabbit_connection, rabbit_host => $rabbit_host,
}
} }
# Install / configure nova-compute # Install / configure nova-compute