From 4b47db95bf16376c2c7f5a2aebe63ae21f3aaa69 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Mon, 9 Jul 2012 15:46:52 -0700 Subject: [PATCH] Move ceph/* to top-level. This repository used to be a collection of several cookbooks, but this hasn't been true for a month, since a77b418b95df8f2b6f56d9a90e47dc62100cdf4d. Simplifies the file layout and makes this look more like your usual cookbook. Thanks to Guilhem Lettron --- README.md | 114 ++++++++++++++++++ {ceph/attributes => attributes}/conf.rb | 0 {ceph/attributes => attributes}/radosgw.rb | 0 ceph/README.md | 113 ----------------- {ceph/files => files}/default/radosgw | 0 {ceph/libraries => libraries}/default.rb | 0 ceph/metadata.rb => metadata.rb | 0 {ceph/recipes => recipes}/apt.rb | 0 {ceph/recipes => recipes}/bootstrap_osd.rb | 0 {ceph/recipes => recipes}/conf.rb | 0 {ceph/recipes => recipes}/default.rb | 0 {ceph/recipes => recipes}/mds.rb | 0 {ceph/recipes => recipes}/mon.rb | 0 {ceph/recipes => recipes}/osd.rb | 0 {ceph/recipes => recipes}/rados-rest.rb | 0 {ceph/recipes => recipes}/radosgw.rb | 0 {ceph/roles => roles}/ceph-mds.rb | 0 {ceph/roles => roles}/ceph-mon.rb | 0 {ceph/roles => roles}/ceph-osd.rb | 0 {ceph/roles => roles}/ceph-radosgw.rb | 0 .../default/apt-sources-list.release.erb | 0 .../default/ceph.conf.erb | 0 .../default/mods/fastcgi.conf.erb | 0 .../default/rgw.conf.erb | 0 24 files changed, 114 insertions(+), 113 deletions(-) rename {ceph/attributes => attributes}/conf.rb (100%) rename {ceph/attributes => attributes}/radosgw.rb (100%) delete mode 100644 ceph/README.md rename {ceph/files => files}/default/radosgw (100%) rename {ceph/libraries => libraries}/default.rb (100%) rename ceph/metadata.rb => metadata.rb (100%) rename {ceph/recipes => recipes}/apt.rb (100%) rename {ceph/recipes => recipes}/bootstrap_osd.rb (100%) rename {ceph/recipes => recipes}/conf.rb (100%) rename {ceph/recipes => recipes}/default.rb (100%) rename {ceph/recipes => recipes}/mds.rb (100%) rename {ceph/recipes => recipes}/mon.rb (100%) rename {ceph/recipes => recipes}/osd.rb (100%) rename {ceph/recipes => recipes}/rados-rest.rb (100%) rename {ceph/recipes => recipes}/radosgw.rb (100%) rename {ceph/roles => roles}/ceph-mds.rb (100%) rename {ceph/roles => roles}/ceph-mon.rb (100%) rename {ceph/roles => roles}/ceph-osd.rb (100%) rename {ceph/roles => roles}/ceph-radosgw.rb (100%) rename {ceph/templates => templates}/default/apt-sources-list.release.erb (100%) rename {ceph/templates => templates}/default/ceph.conf.erb (100%) rename {ceph/templates => templates}/default/mods/fastcgi.conf.erb (100%) rename {ceph/templates => templates}/default/rgw.conf.erb (100%) diff --git a/README.md b/README.md index 5c00421..31b214e 100644 --- a/README.md +++ b/README.md @@ -1 +1,115 @@ +DESCRIPTION +=========== + These are incomplete, use with caution. They have pulled from a working configuration using Debian. They will require work for other distributions. They also assume your package manager (apt-get, etc) are already configured for a ceph repository. + +Installs and configures Ceph, a distributed network storage and filesystem +designed to provide excellent performance, reliability, and scalability. + +REQUIREMENTS +============ + +Platform +-------- + +Tested as working: + * Debian Squeeze (6.x) + +Cookbooks +--------- + +The ceph cookbook requires the following cookbooks from Opscode: + +https://github.com/opscode/cookbooks + +* apache2 + +Also required are the following cookbooks New Dream Network (DreamHost.com): + +https://github.com/NewDreamNetwork/ceph-cookbooks + + +ATTRIBUTES +========== + +Ceph Rados Gateway +------------------ + +* node[:ceph][:radosgw][:api_fqdn] +* node[:ceph][:radosgw][:admin_email] +* node[:ceph][:radosgw][:rgw_addr] + +TEMPLATES +========= + + + +USAGE +===== + +Ceph cluster design is beyond the scope of this README, please turn to the +public wiki, mailing lists, visit our IRC channel or Ceph Support page: + +http://ceph.newdream.net/wiki/ +http://ceph.newdream.net/mailing-lists-and-irc/ +http://www.cephsupport.com/ + +This diagram helps visualize recipe inheritence of the ceph cookbook recipes: + + + +Ceph Monitor +------------ + +Ceph monitor nodes should use the ceph::mon recipe. + +Includes: + +* ceph::default +* ceph::rados-rest + +Ceph Metadata Server +-------------------- + +Ceph metadata server nodes should use the ceph::mds recipe. + +Includes: + +* ceph::default + +Ceph OSD +-------- + +Ceph OSD nodes should use the ceph::osd recipe + +Includes: + +* ceph::default + +Ceph Rados Gateway +------------------ + +Ceph Rados Gateway nodes should use the ceph::radosgw recipe + +Includes: + +* ceph::rados-rest + +LICENSE AND AUTHORS +=================== + +* Author: Kyle Bader + +* 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. diff --git a/ceph/attributes/conf.rb b/attributes/conf.rb similarity index 100% rename from ceph/attributes/conf.rb rename to attributes/conf.rb diff --git a/ceph/attributes/radosgw.rb b/attributes/radosgw.rb similarity index 100% rename from ceph/attributes/radosgw.rb rename to attributes/radosgw.rb diff --git a/ceph/README.md b/ceph/README.md deleted file mode 100644 index cdf1b03..0000000 --- a/ceph/README.md +++ /dev/null @@ -1,113 +0,0 @@ -DESCRIPTION -=========== - -Installs and configures Ceph, a distributed network storage and filesystem -designed to provide excellent performance, reliability, and scalability. - -REQUIREMENTS -============ - -Platform --------- - -Tested as working: - * Debian Squeeze (6.x) - -Cookbooks ---------- - -The ceph cookbook requires the following cookbooks from Opscode: - -https://github.com/opscode/cookbooks - -* apache2 - -Also required are the following cookbooks New Dream Network (DreamHost.com): - -https://github.com/NewDreamNetwork/ceph-cookbooks - - -ATTRIBUTES -========== - -Ceph Rados Gateway ------------------- - -* node[:ceph][:radosgw][:api_fqdn] -* node[:ceph][:radosgw][:admin_email] -* node[:ceph][:radosgw][:rgw_addr] - -TEMPLATES -========= - - - -USAGE -===== - -Ceph cluster design is beyond the scope of this README, please turn to the -public wiki, mailing lists, visit our IRC channel or Ceph Support page: - -http://ceph.newdream.net/wiki/ -http://ceph.newdream.net/mailing-lists-and-irc/ -http://www.cephsupport.com/ - -This diagram helps visualize recipe inheritence of the ceph cookbook recipes: - - - -Ceph Monitor ------------- - -Ceph monitor nodes should use the ceph::mon recipe. - -Includes: - -* ceph::default -* ceph::rados-rest - -Ceph Metadata Server --------------------- - -Ceph metadata server nodes should use the ceph::mds recipe. - -Includes: - -* ceph::default - -Ceph OSD --------- - -Ceph OSD nodes should use the ceph::osd recipe - -Includes: - -* ceph::default - -Ceph Rados Gateway ------------------- - -Ceph Rados Gateway nodes should use the ceph::radosgw recipe - -Includes: - -* ceph::rados-rest - -LICENSE AND AUTHORS -=================== - -* Author: Kyle Bader - -* 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. diff --git a/ceph/files/default/radosgw b/files/default/radosgw similarity index 100% rename from ceph/files/default/radosgw rename to files/default/radosgw diff --git a/ceph/libraries/default.rb b/libraries/default.rb similarity index 100% rename from ceph/libraries/default.rb rename to libraries/default.rb diff --git a/ceph/metadata.rb b/metadata.rb similarity index 100% rename from ceph/metadata.rb rename to metadata.rb diff --git a/ceph/recipes/apt.rb b/recipes/apt.rb similarity index 100% rename from ceph/recipes/apt.rb rename to recipes/apt.rb diff --git a/ceph/recipes/bootstrap_osd.rb b/recipes/bootstrap_osd.rb similarity index 100% rename from ceph/recipes/bootstrap_osd.rb rename to recipes/bootstrap_osd.rb diff --git a/ceph/recipes/conf.rb b/recipes/conf.rb similarity index 100% rename from ceph/recipes/conf.rb rename to recipes/conf.rb diff --git a/ceph/recipes/default.rb b/recipes/default.rb similarity index 100% rename from ceph/recipes/default.rb rename to recipes/default.rb diff --git a/ceph/recipes/mds.rb b/recipes/mds.rb similarity index 100% rename from ceph/recipes/mds.rb rename to recipes/mds.rb diff --git a/ceph/recipes/mon.rb b/recipes/mon.rb similarity index 100% rename from ceph/recipes/mon.rb rename to recipes/mon.rb diff --git a/ceph/recipes/osd.rb b/recipes/osd.rb similarity index 100% rename from ceph/recipes/osd.rb rename to recipes/osd.rb diff --git a/ceph/recipes/rados-rest.rb b/recipes/rados-rest.rb similarity index 100% rename from ceph/recipes/rados-rest.rb rename to recipes/rados-rest.rb diff --git a/ceph/recipes/radosgw.rb b/recipes/radosgw.rb similarity index 100% rename from ceph/recipes/radosgw.rb rename to recipes/radosgw.rb diff --git a/ceph/roles/ceph-mds.rb b/roles/ceph-mds.rb similarity index 100% rename from ceph/roles/ceph-mds.rb rename to roles/ceph-mds.rb diff --git a/ceph/roles/ceph-mon.rb b/roles/ceph-mon.rb similarity index 100% rename from ceph/roles/ceph-mon.rb rename to roles/ceph-mon.rb diff --git a/ceph/roles/ceph-osd.rb b/roles/ceph-osd.rb similarity index 100% rename from ceph/roles/ceph-osd.rb rename to roles/ceph-osd.rb diff --git a/ceph/roles/ceph-radosgw.rb b/roles/ceph-radosgw.rb similarity index 100% rename from ceph/roles/ceph-radosgw.rb rename to roles/ceph-radosgw.rb diff --git a/ceph/templates/default/apt-sources-list.release.erb b/templates/default/apt-sources-list.release.erb similarity index 100% rename from ceph/templates/default/apt-sources-list.release.erb rename to templates/default/apt-sources-list.release.erb diff --git a/ceph/templates/default/ceph.conf.erb b/templates/default/ceph.conf.erb similarity index 100% rename from ceph/templates/default/ceph.conf.erb rename to templates/default/ceph.conf.erb diff --git a/ceph/templates/default/mods/fastcgi.conf.erb b/templates/default/mods/fastcgi.conf.erb similarity index 100% rename from ceph/templates/default/mods/fastcgi.conf.erb rename to templates/default/mods/fastcgi.conf.erb diff --git a/ceph/templates/default/rgw.conf.erb b/templates/default/rgw.conf.erb similarity index 100% rename from ceph/templates/default/rgw.conf.erb rename to templates/default/rgw.conf.erb