Revert last three commits.

The roles are named ceph-mon etc. The recipes are named ceph::mon etc.
The cookbook is named "ceph". The git repository is named
"ceph-cookbooks.git". The string "ceph-cookbooks" should not be
anywhere in the code anywhere inside of the cookbook.

diff --git a/roles/ceph-mds.rb b/roles/ceph-mds.rb
index 9eebf1bbeb9ee62515cbf422dd2df180ee4d3194..d0b63804a0139934aed9d27530e67ffdbbe20998 100644 (file)
--- a/roles/ceph-mds.rb
+++ b/roles/ceph-mds.rb
@@ -1,5 +1,5 @@
-name "ceph-cookbooks-mds"
+name "ceph-mds"
 description "Ceph Metadata Server"
 run_list(
-        'recipe[ceph-cookbooks::mds]'
+        'recipe[ceph::mds]'
 )

diff --git a/roles/ceph-mon.rb b/roles/ceph-mon.rb
index 17b0f88fc2cf9f3089618aa3f9d969b97068f5bb..0fd71261da1009d8d33b1cd09237e45fbf6c9712 100644 (file)
--- a/roles/ceph-mon.rb
+++ b/roles/ceph-mon.rb
@@ -1,5 +1,5 @@
-name "ceph-cookbooks-mon"
+name "ceph-mon"
 description "Ceph Monitor"
 run_list(
-        'recipe[ceph-cookbooks::mon]'
+        'recipe[ceph::mon]'
 )

diff --git a/roles/ceph-osd.rb b/roles/ceph-osd.rb
index b53aec42487b491e802c92297cc13b100c92ed7f..edf4088e1827c93eee5d185c3a16a07f13337dd1 100644 (file)
--- a/roles/ceph-osd.rb
+++ b/roles/ceph-osd.rb
@@ -1,5 +1,5 @@
-name "ceph-cookbooks-osd"
+name "ceph-osd"
 description "Ceph Object Storage Device"
 run_list(
-        'recipe[ceph-cookbooks::bootstrap_osd]'
+        'recipe[ceph::bootstrap_osd]'
 )

diff --git a/roles/ceph-radosgw.rb b/roles/ceph-radosgw.rb
index aa748cf4f395a79713f28b864dc9531b9e785565..a4ee87a1e9753816cae43e1c362f9e63cc66e555 100644 (file)
--- a/roles/ceph-radosgw.rb
+++ b/roles/ceph-radosgw.rb
@@ -1,5 +1,5 @@
-name "ceph-cookbooks-radosgw"
+name "ceph-radosgw"
 description "Ceph RADOS Gateway"
 run_list(
-        'recipe[ceph-cookbooks::radosgw]'
+        'recipe[ceph::radosgw]'
 )