From 7d84c2ab50ccd59004a50a444dba49c4845b011d Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@inktank.com>
Date: Thu, 2 Aug 2012 14:51:56 -0700
Subject: [PATCH] Simplify recipes: merge rados-rest into radosgw.

---
 README.md             |  4 ----
 recipes/rados-rest.rb | 30 ------------------------------
 recipes/radosgw.rb    | 14 +++++++-------
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 recipes/rados-rest.rb

diff --git a/README.md b/README.md
index 270db71..6e30dc3 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,6 @@ Ceph monitor nodes should use the ceph::mon recipe.
 Includes:
 
 * ceph::default
-* ceph::rados-rest
 
 Ceph Metadata Server
 --------------------
@@ -103,9 +102,6 @@ Ceph Rados Gateway
 
 Ceph Rados Gateway nodes should use the ceph::radosgw recipe
 
-Includes:
-
-* ceph::rados-rest
 
 LICENSE AND AUTHORS
 ===================
diff --git a/recipes/rados-rest.rb b/recipes/rados-rest.rb
deleted file mode 100644
index 0001cca..0000000
--- a/recipes/rados-rest.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Author:: Kyle Bader <kyle.bader@dreamhost.com>
-# Cookbook Name:: ceph
-# Recipe:: rados-client
-#
-# Copyright 2011, DreamHost Web Hosting
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-		        
-
-packages = %w{
-	radosgw
-	radosgw-dbg
-}
-
-packages.each do |pkg|
-	package pkg do
-		action :upgrade
-	end
-end
diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index 8a7fe65..dcc2093 100644
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -16,17 +16,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-		        
-include_recipe "ceph::rados-rest"
-
-packages = %w{
-	libapache2-mod-fastcgi
-}
 
 include_recipe "apache2"
 
+packages = %w{
+	radosgw
+	radosgw-dbg
+	libapache2-mod-fastcgi
+}
+
 packages.each do |pkg|
-	package pkg do 
+	package pkg do
 		action :upgrade
 	end
 end