From 867b783b8a20a71466dc72c5be12cc195cb47814 Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Wed, 24 Oct 2012 11:13:27 -0700
Subject: [PATCH] Add cinder config to nova::compute

embed logic for managing cinder in openstack::compute.
---
 manifests/compute.pp    | 19 +++++++++++++++++++
 manifests/controller.pp |  1 +
 2 files changed, 20 insertions(+)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index c093cc5..382254e 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -46,6 +46,13 @@ class openstack::compute (
   # VNC
   $vnc_enabled                   = true,
   $vncproxy_host                 = undef,
+  $vncserver_listen              = $internal_address,
+  # cinder / volumes
+  $cinder                        = true,
+  $cinder_sql_connection         = undef,
+  $manage_volumes                = true,
+  $nova_volume                   = 'cinder-volumes',
+  $iscsi_ip_address              = '127.0.0.1',
   # General
   $verbose                       = 'False',
   $enabled                       = true
@@ -134,5 +141,17 @@ class openstack::compute (
     # TODO install quantum
   }
 
+  if ($cinder) {
+    class { 'cinder':
+      rabbit_password => $rabbit_password,
+      rabbit_host     => $rabbit_host,
+      sql_connection  => $cinder_sql_connection,
+      verbose         => $verbose,
+    }
+    class { 'cinder::volume': }
+    class { 'cinder::volume::iscsi': }
+  } else {
+    # Set up nova-volume
+  }
 
 }
diff --git a/manifests/controller.pp b/manifests/controller.pp
index c510050..8391bef 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -127,6 +127,7 @@ class openstack::controller (
   $verbose                 = 'False',
   $export_resources        = true,
   # if the cinder management components should be installed
+  $cinder                  = false,
   $cinder_user_password    = 'cinder_user_pass',
   $cinder_db_password      = 'cinder_db_pass',
   $cinder_db_user          = 'cinder',