From 80ba0267a3045d090d29a5e0c93c7de9a51c86c5 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 15 Mar 2013 11:16:29 -0700
Subject: [PATCH] Add nova-conductor code for grizzly.

It is required to install grizzly.
---
 manifests/site.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 29e088e..76e2423 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -129,6 +129,14 @@ node /openstack-controller/ {
     }
   }
 
+  # we need to install conductor only for grizzly
+  # because this version of the manifests needs to support both
+  if $openstack_version == 'grizzly' {
+    class { 'nova::conductor':
+      enabled => true,
+    }
+  }
+
   class { 'openstack::controller':
     #floating_range          => $floating_network_range,
   # Required Network