Moved _common to default.

Moving _common.rb to default.rb makes this cookbook easier to include
in other cookbooks.  This also brings this cookbook back in line
with its README.

Moved _common_install.rb into default as it was only a one line
include.

diff --git a/README.md b/README.md
index 8e311b6172abe45f1fececf7c86f8a75f945f2c4..a30cf863cc2aa2465d856dc720c7f68e3a371439 100644 (file)
--- a/README.md
+++ b/README.md
@@ -67,7 +67,6 @@ Ceph monitor nodes should use the ceph-mon role.
 Includes:
 
 * ceph::default
-* ceph::conf
 
 ### Ceph Metadata Server
 
@@ -84,7 +83,6 @@ Ceph OSD nodes should use the ceph-osd role
 Includes:
 
 * ceph::default
-* ceph::conf
 
 ### Ceph Rados Gateway
 

diff --git a/recipes/_common.rb b/recipes/_common.rb
deleted file mode 100644 (file)
index f738e65..0000000
--- a/recipes/_common.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-include_recipe 'ceph::_common_install'
-
-# Tools needed by cookbook
-node['ceph']['packages'].each do |pck|
-  package pck
-end
-
-chef_gem 'netaddr'

diff --git a/recipes/_common_install.rb b/recipes/_common_install.rb
deleted file mode 100644 (file)
index 171a227..0000000
--- a/recipes/_common_install.rb
+++ /dev/null
@@ -1 +0,0 @@
-include_recipe 'ceph::repo' if node['ceph']['install_repo']

diff --git a/recipes/cephfs_install.rb b/recipes/cephfs_install.rb
index f75147c37bdf5c0ac2fac4cedd507e57a7aa3c7f..434e22ba6e8e9ee930eec3e77ba4e3d39f95160d 100644 (file)
--- a/recipes/cephfs_install.rb
+++ b/recipes/cephfs_install.rb
@@ -1,4 +1,4 @@
-include_recipe 'ceph::_common_install'
+include_recipe 'ceph'
 
 node['ceph']['cephfs']['packages'].each do |pck|
   package pck

diff --git a/recipes/default.rb b/recipes/default.rb
new file mode 100644 (file)
index 0000000..936bc33
--- /dev/null
+++ b/recipes/default.rb
@@ -0,0 +1,9 @@
+include_recipe 'ceph::repo' if node['ceph']['install_repo']
+include_recipe 'ceph::conf'
+
+# Tools needed by cookbook
+node['ceph']['packages'].each do |pck|
+  package pck
+end
+
+chef_gem 'netaddr'

diff --git a/recipes/mds.rb b/recipes/mds.rb
index 69ca3a5f1a454fbfc17423d28b9b97283fe33a26..aedff1515fbbdbb62748098b81cc6620874ab0e4 100644 (file)
--- a/recipes/mds.rb
+++ b/recipes/mds.rb
@@ -17,9 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_recipe 'ceph::_common'
+include_recipe 'ceph'
 include_recipe 'ceph::mds_install'
-include_recipe 'ceph::conf'
 
 cluster = 'ceph'
 

diff --git a/recipes/mds_install.rb b/recipes/mds_install.rb
index 3ce533a6d9a9f28da0ad5ec733a5ad3053352fbc..a04ee5a4cee670de8b06f462ad7fb7c5e7431fd1 100644 (file)
--- a/recipes/mds_install.rb
+++ b/recipes/mds_install.rb
@@ -1,4 +1,4 @@
-include_recipe 'ceph::_common_install'
+include_recipe 'ceph'
 
 node['ceph']['mds']['packages'].each do |pck|
   package pck

diff --git a/recipes/mon.rb b/recipes/mon.rb
index 2a7ccb35aa0dcd08e2a9a8124d69a7a777f5fafc..88ac8805b2ac35c5d05aaffa66bf6bb7fa3f2a74 100644 (file)
--- a/recipes/mon.rb
+++ b/recipes/mon.rb
@@ -16,9 +16,8 @@
 
 node.default['ceph']['is_mon'] = true
 
-include_recipe 'ceph::_common'
+include_recipe 'ceph'
 include_recipe 'ceph::mon_install'
-include_recipe 'ceph::conf'
 
 service_type = node['ceph']['mon']['init_style']
 

diff --git a/recipes/mon_install.rb b/recipes/mon_install.rb
index 557ad4cca8f4f056bd05bc060bb153c57203e7fa..a125f3505dbc970a5e015a57ec6889239b1d4278 100644 (file)
--- a/recipes/mon_install.rb
+++ b/recipes/mon_install.rb
@@ -1,4 +1,4 @@
-include_recipe 'ceph::_common_install'
+include_recipe 'ceph'
 
 node['ceph']['mon']['packages'].each do |pck|
   package pck

diff --git a/recipes/osd.rb b/recipes/osd.rb
index fc2f9c6bd7407f439ee8a74012f38d090766fad3..a0ff278bc4306939035a0692f14e6a6d34fe3f6c 100644 (file)
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -31,9 +31,8 @@
 #   }
 # ]
 
-include_recipe 'ceph::_common'
+include_recipe 'ceph'
 include_recipe 'ceph::osd_install'
-include_recipe 'ceph::conf'
 
 package 'gdisk' do
   action :upgrade

diff --git a/recipes/osd_install.rb b/recipes/osd_install.rb
index 21991ad4694543c6b08d74b08f20dda835b618c4..f368db3fcc9c9fed6778746cb7fbd4ada02a656f 100644 (file)
--- a/recipes/osd_install.rb
+++ b/recipes/osd_install.rb
@@ -1,4 +1,4 @@
-include_recipe 'ceph::_common_install'
+include_recipe 'ceph'
 
 node['ceph']['osd']['packages'].each do |pck|
   package pck

diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index 0a5bb0df60f8b0f83492493089bc57d9feb01342..410b557c1688c7249a68368bf9b348620f48dbfe 100644 (file)
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -19,9 +19,8 @@
 
 node.default['ceph']['is_radosgw'] = true
 
-include_recipe 'ceph::_common'
+include_recipe 'ceph'
 include_recipe 'ceph::radosgw_install'
-include_recipe 'ceph::conf'
 
 directory '/var/log/radosgw' do
   owner node['apache']['user']

diff --git a/recipes/radosgw_apache2.rb b/recipes/radosgw_apache2.rb
index 8b266c0beffa2c5cc0a68ee9d7b59a181e4134bf..119b7ebd35389e0d0a4faabe324585289fd2f89b 100644 (file)
--- a/recipes/radosgw_apache2.rb
+++ b/recipes/radosgw_apache2.rb
@@ -41,8 +41,7 @@
 #   end
 # end
 
-include_recipe 'ceph::_common'
-include_recipe 'ceph::_common_install'
+include_recipe 'ceph'
 include_recipe 'ceph::radosgw_apache2_repo'
 
 node['ceph']['radosgw']['apache2']['packages'].each do |pck|

diff --git a/recipes/radosgw_install.rb b/recipes/radosgw_install.rb
index 7944d496c29acfaf15b1a29a24d5d26cd42fca70..5dde1d7407593b04fb0381f96d50bfc7c8187d30 100644 (file)
--- a/recipes/radosgw_install.rb
+++ b/recipes/radosgw_install.rb
@@ -1,4 +1,4 @@
-include_recipe 'ceph::_common_install'
+include_recipe 'ceph'
 
 node['ceph']['radosgw']['packages'].each do |pck|
   package pck

diff --git a/resources/cephfs.rb b/resources/cephfs.rb
index 191d942590a74cdfeb60f72e34df4acd7727a758..34e64f3d2593b6500d4fbee1db3858ee8a6046eb 100644 (file)
--- a/resources/cephfs.rb
+++ b/resources/cephfs.rb
@@ -8,7 +8,6 @@ attribute :cephfs_subdir, :kind_of => String, :default => '/'
 def initialize(*args)
   super
   @action = :mount
-  @run_context.include_recipe 'ceph::_common'
+  @run_context.include_recipe 'ceph'
   @run_context.include_recipe 'ceph::cephfs_install'
-  @run_context.include_recipe 'ceph::conf'
 end