Simplify recipes: merge rados-rest into radosgw.

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
 ===================

recipes/rados-rest.rb

@@ -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

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