From cbcf0564d0703d5f0d6227d967f2bbadc9485ec7 Mon Sep 17 00:00:00 2001
From: Dan Bode <bodepd@gmail.com>
Date: Wed, 15 May 2013 22:30:12 -0700
Subject: [PATCH] add nova-conductor

Adds the nova conductor service to the nova
controller. This service is now a requirement for
grizzly.

this commit is known to break folsom compatibility.

Change-Id: I2b527e74210d8f10689e141198b7a8ed04b111c2
---
 manifests/nova/controller.pp              | 5 +++--
 spec/classes/openstack_controller_spec.rb | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp
index 1894b35..e7984ac 100644
--- a/manifests/nova/controller.pp
+++ b/manifests/nova/controller.pp
@@ -87,7 +87,7 @@ class openstack::nova::controller (
   } else {
     $vncproxy_host_real = $public_address
   }
-  
+
   $sql_connection    = $nova_db
   $glance_connection = $real_glance_api_servers
   $rabbit_connection = $internal_address
@@ -209,7 +209,8 @@ class openstack::nova::controller (
     'nova::scheduler',
     'nova::objectstore',
     'nova::cert',
-    'nova::consoleauth'
+    'nova::consoleauth',
+    'nova::conductor'
   ]:
     enabled => $enabled,
   }
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index c402aa4..47e4091 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -366,6 +366,7 @@ describe 'openstack::controller' do
         should contain_class('nova::consoleauth').with(:enabled => true)
         should contain_class('nova::scheduler').with(:enabled => true)
         should contain_class('nova::objectstore').with(:enabled => true)
+        should contain_class('nova::conductor').with(:enabled => true)
         should contain_class('nova::vncproxy').with(
           :enabled         => true,
           :host            => '10.0.0.1'