Explicitly install ceph-fs-common for cephfs

diff --git a/attributes/cephfs.rb b/attributes/cephfs.rb
index 1043a477b828ca1d596b94663e7c0c7e4088f19f..981b3388e8631c4544da91dc8a1a96f633131736 100644 (file)
--- a/attributes/cephfs.rb
+++ b/attributes/cephfs.rb
@@ -1 +1,10 @@
 default['ceph']['cephfs_mount'] = '/ceph'
+
+case node['platform_family']
+when 'debian'
+  packages = ['ceph-fs-common']
+  packages += debug_packages(packages) if node['ceph']['install_debug']
+  default['ceph']['cephfs']['packages'] = packages
+else
+  default['ceph']['cephfs']['packages'] = []
+end

diff --git a/recipes/cephfs.rb b/recipes/cephfs.rb
index 6017c2f4ed16de4c64d01da57ccc70f0d1bf38cc..64dbaf9d56296d4bfb744295aba5dacad4253c12 100644 (file)
--- a/recipes/cephfs.rb
+++ b/recipes/cephfs.rb
@@ -18,6 +18,7 @@
 # limitations under the License.
 
 include_recipe 'ceph::_common'
+include_recipe 'ceph::cephfs_install'
 include_recipe 'ceph::conf'
 
 name = 'cephfs'

diff --git a/recipes/cephfs_install.rb b/recipes/cephfs_install.rb
new file mode 100644 (file)
index 0000000..826997d
--- /dev/null
+++ b/recipes/cephfs_install.rb
@@ -0,0 +1,5 @@
+include_recipe 'ceph::_common_install'
+
+node['ceph']['cephfs']['packages'].each do |pck|
+  package pck
+end