From a77b418b95df8f2b6f56d9a90e47dc62100cdf4d Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Sun, 3 Jun 2012 19:38:36 -0700 Subject: [PATCH] Remove the btrfs and parted cookbooks. Simplifies installs, and they are not used currently anyway. They may make a return later, in simpler form. --- btrfs/metadata.rb | 5 ----- btrfs/recipes/default.rb | 29 ----------------------------- ceph/README.md | 3 --- ceph/metadata.rb | 2 -- ceph/recipes/osd.rb | 2 -- parted/metadata.rb | 5 ----- parted/recipes/default.rb | 22 ---------------------- 7 files changed, 68 deletions(-) delete mode 100644 btrfs/metadata.rb delete mode 100644 btrfs/recipes/default.rb delete mode 100644 parted/metadata.rb delete mode 100644 parted/recipes/default.rb diff --git a/btrfs/metadata.rb b/btrfs/metadata.rb deleted file mode 100644 index 3a369d8..0000000 --- a/btrfs/metadata.rb +++ /dev/null @@ -1,5 +0,0 @@ -maintainer "Kyle Bader" -maintainer_email "kyle.bader@dreamhost.com" -license "Apache 2.0" -description "Installs tools for BTRFS filesystems" -version "0.0.1" diff --git a/btrfs/recipes/default.rb b/btrfs/recipes/default.rb deleted file mode 100644 index 47e2af8..0000000 --- a/btrfs/recipes/default.rb +++ /dev/null @@ -1,29 +0,0 @@ -# -# Author:: Kyle Bader -# Cookbook Name:: btrfs -# Recipe:: default -# -# 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{ - btrfs-tools - btrfs-tools-dbg -} - -packages.each do |pkg| - package pkg do - action :upgrade - end -end diff --git a/ceph/README.md b/ceph/README.md index 4b990df..cdf1b03 100644 --- a/ceph/README.md +++ b/ceph/README.md @@ -26,9 +26,6 @@ Also required are the following cookbooks New Dream Network (DreamHost.com): https://github.com/NewDreamNetwork/ceph-cookbooks -* btrfs -* parted - ATTRIBUTES ========== diff --git a/ceph/metadata.rb b/ceph/metadata.rb index 0d5dd49..52349c0 100644 --- a/ceph/metadata.rb +++ b/ceph/metadata.rb @@ -5,5 +5,3 @@ description "Installs/Configures the Ceph distributed filesystem" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version "0.0.10" depends "apache2" -depends "btrfs" -depends "parted" diff --git a/ceph/recipes/osd.rb b/ceph/recipes/osd.rb index 4808ae5..acad61b 100644 --- a/ceph/recipes/osd.rb +++ b/ceph/recipes/osd.rb @@ -17,6 +17,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -include_recipe "btrfs" -include_recipe "parted" include_recipe "ceph::default" diff --git a/parted/metadata.rb b/parted/metadata.rb deleted file mode 100644 index f4f207c..0000000 --- a/parted/metadata.rb +++ /dev/null @@ -1,5 +0,0 @@ -maintainer "Kyle Bader" -maintainer_email "kyle.bader@dreamhost.com" -license "Apache 2.0" -description "Installs the parted disk utility" -version "0.0.1" diff --git a/parted/recipes/default.rb b/parted/recipes/default.rb deleted file mode 100644 index f06966b..0000000 --- a/parted/recipes/default.rb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Author:: Kyle Bader -# Cookbook Name:: parted -# Recipe:: default -# -# 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. - -package "parted" do - action :upgrade -end