From 45abd542818f9ca9acbbda6855a498cc695f38b7 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Sun, 14 Jul 2013 12:24:06 +0000
Subject: [PATCH] Fix requirements for controller node

---
 manifests/node/controller.pp | 39 +++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/manifests/node/controller.pp b/manifests/node/controller.pp
index 7de2ecc..769f266 100644
--- a/manifests/node/controller.pp
+++ b/manifests/node/controller.pp
@@ -1,13 +1,38 @@
 class kickstack::node::controller inherits kickstack {
 
-  include kickstack::glance::registry
+  $keystone_internal_address = getvar("${fact_prefix}keystone_internal_address")
+  $glance_sql_conn = getvar("${fact_prefix}glance_sql_connection")
+  $glance_keystone_password = getvar("${fact_prefix}glance_keystone_password")
+  $cinder_sql_conn = getvar("${fact_prefix}cinder_sql_connection")
+  $cinder_keystone_password = getvar("${fact_prefix}cinder_keystone_password")
+  $nova_sql_conn = getvar("${fact_prefix}nova_sql_connection")
+  $nova_keystone_password = getvar("${fact_prefix}nova_keystone_password")
 
-  include kickstack::cinder::scheduler
+  case $::kickstack::rpc {
+    'rabbitmq': {
+      $amqp_host = getvar("${::kickstack::fact_prefix}rabbit_host")
+      $amqp_password = getvar("${::kickstack::fact_prefix}rabbit_password")
+    }
+    'qpid': {
+      $amqp_host = getvar("${::kickstack::fact_prefix}qpid_host")
+      $amqp_password = getvar("${::kickstack::fact_prefix}qpid_password")
+    }
+  }
 
-  include kickstack::nova::cert
-  include kickstack::nova::conductor
-  include kickstack::nova::consoleauth
-  include kickstack::nova::objectstore
-  include kickstack::nova::scheduler
+  if $glance_sql_conn and $glance_keystone_password {
+    include kickstack::glance::registry
+  }
 
+  if $amqp_host and $amqp_password {
+    if $cinder_sql_conn and $cinder_keystone_password {
+      include kickstack::cinder::scheduler
+    }
+    if $nova_sql_conn and $nova_keystone_password {
+      include kickstack::nova::cert
+      include kickstack::nova::conductor
+      include kickstack::nova::consoleauth
+      include kickstack::nova::objectstore
+      include kickstack::nova::scheduler
+    }
+  }
 }