From f593f2e41de7bd316b90a18d150fbdf4509cd0d4 Mon Sep 17 00:00:00 2001
From: John Dewey <john@dewey.ws>
Date: Thu, 3 Jan 2013 22:14:08 -0800
Subject: [PATCH] Metadata and README cleanups

---
 README.md   |  8 ++++++--
 metadata.rb | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index fe8ff63..c2f3b10 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,10 @@ The following cookbooks are dependencies:
 * keystone
 * mysql
 * openssh
-* rabbitmq
-* selinux (Fedora)
 * openstack-common
 * openstack-utils
+* rabbitmq
+* selinux (Fedora)
 
 Recipes
 =======
@@ -40,6 +40,10 @@ api
 - Installs the cinder-api, sets up the cinder database,
  and cinder service/user/endpoints in keystone
 
+db
+--
+- Creates the Cinder database
+
 scheduler
 ----
 - Installs the cinder-scheduler service
diff --git a/metadata.rb b/metadata.rb
index 85f82d0..0ef7fcb 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,17 +6,22 @@ description      "The OpenStack Advanced Volume Management service Cinder."
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          "2012.2.0"
 
-supports         "ubuntu"
-supports         "fedora"
-supports         "redhat"
+recipe           "cinder::api", "Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone"
+recipe           "cinder::db", "Creates the Cinder database"
+recipe           "cinder::scheduler", "Installs the cinder-scheduler service"
+recipe           "cinder::volume", "Installs the cinder-volume service and sets up the iscsi helper"
+
+%w{ ubuntu fedora redhat centos }.each do |os|
+  supports os
+end
 
-depends          "mysql"
-depends          "database"
-depends          "openstack-common", ">= 0.1.5"
 depends          "apt"
-depends          "rabbitmq"
+depends          "database"
 depends          "glance"
-depends          "openstack-utils"
 depends          "keystone"
+depends          "mysql"
 depends          "openssh"
+depends          "openstack-common", ">= 0.1.5"
+depends          "openstack-utils"
+depends          "rabbitmq"
 depends          "selinux"