Simplify recipes: merge rados-rest into radosgw.

diff --git a/README.md b/README.md
index 270db711f18af2ded5d82c6972bc00b74967b94a..6e30dc33b0f058dc4484f5da031fab3a4a6b7850 100644 (file)
--- 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 (file)
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 8a7fe65c44265fa83a0f27731045e2fe6f108109..dcc209386cad60625c1e086b4ab7e652aa885011 100644 (file)
--- 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"
+
+include_recipe "apache2"
 
 packages = %w{
+       radosgw
+       radosgw-dbg
        libapache2-mod-fastcgi
 }
 
-include_recipe "apache2"
-
 packages.each do |pkg|
-       package pkg do 
+       package pkg do
                action :upgrade
        end
 end