From: Tommi Virtanen <tv@inktank.com>
Date: Fri, 8 Jun 2012 17:51:18 +0000 (-0700)
Subject: Remove unused recipes oss and xattr.
X-Git-Tag: eval1~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dd63c323697feda401918017d6fa690c6458299;p=ceph-cookbooks.git

Remove unused recipes oss and xattr.

oss was used by DreamHost to deploy obsync.

xattr was used by a workaround for running an ext4 osd on rootfs.
---

diff --git a/ceph/recipes/oss.rb b/ceph/recipes/oss.rb
deleted file mode 100644
index 207224e..0000000
--- a/ceph/recipes/oss.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Author:: Kyle Bader <kyle.bader@dreamhost.com>
-# Cookbook Name:: ceph
-# Recipe:: oss
-#
-# 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.
-		        
-include_recipe "ceph::rados-rest"
-
-package "obsync" do
-	version = node['ceph']['version']
-	action :install
-end
diff --git a/ceph/recipes/xattr.rb b/ceph/recipes/xattr.rb
deleted file mode 100644
index 198dfb1..0000000
--- a/ceph/recipes/xattr.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Make sure / is mounted with extended attributes. Useful for running
-# Ceph OSDs without any extra filesystems mounted. Assumes "osd data"
-# will point to a directory on the root file system.
-
-execute "add user_xattr to root mount options in fstab" do
-  # fugly but works! which is more than i can say for the "mount"
-  # resource, which doesn't seem to like a rootfs with an unknown UUID
-  # at all.
-  command <<-'EOH'
-    perl -pe 'if (m{^([^#]\S*\s+/\s+\S+\s+)(\S+)(\s+.*)$}) { $_="$1$2,user_xattr$3\n" unless $2=~m{(^|,)user_xattr(,|$)}; }' -i.bak /etc/fstab
-  EOH
-end
-
-execute "enable xattr for this boot" do
-  command "mount -o remount,user_xattr /"
-end