From afafbd355fac0d57e01f28f1c31e01dec06b15fa Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 19 Aug 2012 00:40:47 -0700
Subject: [PATCH] Always create nova class

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.
---
 manifests/nova/compute.pp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/manifests/nova/compute.pp b/manifests/nova/compute.pp
index 4446456..d68796d 100644
--- a/manifests/nova/compute.pp
+++ b/manifests/nova/compute.pp
@@ -69,17 +69,14 @@ class openstack::nova::compute (
   $glance_connection = $glance_api_servers
   $rabbit_connection = $rabbit_host
 
-  # Configure Nova
-  if ! defined( Class[nova] ) {
-    class { 'nova':
-      sql_connection     => $final_sql_connection,
-      rabbit_userid      => $rabbit_user,
-      rabbit_password    => $rabbit_password,
-      image_service      => 'nova.image.glance.GlanceImageService',
-      glance_api_servers => $glance_connection,
-      verbose            => $verbose,
-      rabbit_host        => $rabbit_connection,
-    }
+  class { 'nova':
+    sql_connection     => $sql_connection,
+    rabbit_userid      => $rabbit_user,
+    rabbit_password    => $rabbit_password,
+    image_service      => 'nova.image.glance.GlanceImageService',
+    glance_api_servers => $glance_api_servers,
+    verbose            => $verbose,
+    rabbit_host        => $rabbit_host,
   }
 
   # Install / configure nova-compute