replace ceph-disk-* with ceph-disk analogs

attributes/default.rb

@@ -1,6 +1,9 @@
 default['ceph']['install_debug'] = false
 default['ceph']['encrypted_data_bags'] = false
 
+default['ceph']['owner'] = 'ceph'
+default['ceph']['group'] = 'ceph'
+
 default['ceph']['install_repo'] = true
 
 default['ceph']['user_pools'] = []

attributes/mgr.rb

@@ -0,0 +1,12 @@
+include_attribute 'ceph'
+
+default['ceph']['mgr']['init_style'] = node['init_style']
+
+case node['platform_family']
+when 'debian'
+  packages = ['ceph-mgr']
+  packages += debug_packages(packages) if node['ceph']['install_debug']
+  default['ceph']['mgr']['packages'] = packages
+else
+  default['ceph']['mgr']['packages'] = []
+end

attributes/mon.rb

@@ -3,6 +3,7 @@
 default['ceph']['mon']['init_style'] = node['ceph']['init_style']
 
 default['ceph']['mon']['secret_file'] = '/etc/chef/secrets/ceph_mon'
+default['ceph']['mon']['keyring_path'] = '/etc/ceph'
 
 case node['platform_family']
 when 'debian', 'rhel', 'fedora'

attributes/repo.rb

@@ -1,42 +1,44 @@
 default['ceph']['branch'] = 'stable' # Can be stable, testing or dev.
 # Major release version to install or gitbuilder branch
-default['ceph']['version'] = 'firefly'
+default['ceph']['version'] = 'jewel'
 default['ceph']['el_add_epel'] = true
-default['ceph']['repo_url'] = 'http://ceph.com'
+default['ceph']['repo_url'] = 'http://download.ceph.com'
 default['ceph']['extras_repo_url'] = 'http://ceph.com/packages/ceph-extras'
 default['ceph']['extras_repo'] = false
+default['ceph']['package_action'] = :install
+default['ceph']['exactversion'] = nil
 
 case node['platform_family']
 when 'debian'
   # Debian/Ubuntu default repositories
   default['ceph']['debian']['stable']['repository'] = "#{node['ceph']['repo_url']}/debian-#{node['ceph']['version']}/"
-  default['ceph']['debian']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['debian']['stable']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
   default['ceph']['debian']['testing']['repository'] = "#{node['ceph']['repo_url']}/debian-testing/"
-  default['ceph']['debian']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['debian']['testing']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
   default['ceph']['debian']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-deb-#{node['lsb']['codename']}-x86_64-basic/ref/#{node['ceph']['version']}"
-  default['ceph']['debian']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
+  default['ceph']['debian']['dev']['repository_key'] = "#{node['ceph']['extras_repo_url']}/keys/autobuild.asc"
   default['ceph']['debian']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/debian/"
-  default['ceph']['debian']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['debian']['extras']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
 when 'rhel'
   # Redhat/CentOS default repositories
   default['ceph']['rhel']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/el6/x86_64/"
-  default['ceph']['rhel']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['rhel']['stable']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
   default['ceph']['rhel']['testing']['repository'] = "#{node['ceph']['repo_url']}/rpm-testing/el6/x86_64/"
-  default['ceph']['rhel']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['rhel']['testing']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
   default['ceph']['rhel']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-rpm-centos6-x86_64-basic/ref/#{node['ceph']['version']}/x86_64/"
-  default['ceph']['rhel']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
+  default['ceph']['rhel']['dev']['repository_key'] = "#{node['ceph']['repo_url']}/keys/autobuild.asc"
   default['ceph']['rhel']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/rpm/rhel6/x86_64/"
-  default['ceph']['rhel']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['rhel']['extras']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
 when 'fedora'
   # Fedora default repositories
   default['ceph']['fedora']['stable']['repository'] = "#{node['ceph']['repo_url']}/rpm-#{node['ceph']['version']}/fc#{node['platform_version']}/x86_64/"
-  default['ceph']['fedora']['stable']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['fedora']['stable']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
   default['ceph']['fedora']['testing']['repository'] = "#{node['ceph']['repo_url']}/rpm-testing/fc#{node['platform_version']}/x86_64/"
-  default['ceph']['fedora']['testing']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['fedora']['testing']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
   default['ceph']['fedora']['dev']['repository'] = "http://gitbuilder.ceph.com/ceph-rpm-fc#{node['platform_version']}-x86_64-basic/ref/#{node['ceph']['version']}/RPMS/x86_64/"
-  default['ceph']['fedora']['dev']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
+  default['ceph']['fedora']['dev']['repository_key'] = "#{node['ceph']['repo_url']}/keys/autobuild.asc"
   default['ceph']['fedora']['extras']['repository'] = "#{node['ceph']['extras_repo_url']}/rpm/fedora#{node['platform_version']}/x86_64/"
-  default['ceph']['fedora']['extras']['repository_key'] = 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
+  default['ceph']['fedora']['extras']['repository_key'] = "#{node['ceph']['repo_url']}/keys/release.asc"
 when 'suse'
   # (Open)SuSE default repositories
   # Chef doesn't make a difference between suse and opensuse

libraries/default.rb

@@ -86,7 +86,7 @@ def ip4_address_in_network?(ip, params, net)
 end
 
 def ip6_address_in_network?(ip, params, net)
-  net.contains?(ip) && params['prefixlen'].to_i == net.bits
+  net.contains?(ip)
 end
 
 def ip_address_to_ceph_address(ip, params)

libraries/utils.rb

@@ -22,7 +22,10 @@ def cephfs_requires_fuse
     'cuttlefish' => 3.9,
     'dumpling' => 3.9,
     'emperor' => 3.9,
-    'firefly' => 3.15
+    'firefly' => 3.15,
+    'giant' => 3.15,
+    'hammer' => 4.1,
+    'jewel' => 4.5,
   }
   min_versions.default = 3.15
 
@@ -33,3 +36,15 @@ def cephfs_requires_fuse
     true
   end
 end
+
+def ceph_exactversion(pkg)
+  pkg_ver = nil
+  if node['ceph']['exactversion'] then
+    if node['ceph']['exactversion'].respond_to?(:has_key?) then
+      pkg_ver = node['ceph']['exactversion']['default'] if node['ceph']['exactversion'].has_key?('default')
+      pkg_ver = node['ceph']['exactversion'][pkg] if node['ceph']['exactversion'].has_key?(pkg)
+    else
+      pkg_ver = node['ceph']['exactversion']
+    end
+  end
+end

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache 2.0'
 description 'Installs/Configures the Ceph distributed filesystem'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.9.3'
+version '0.9.37'
 
 depends	'apache2', '>= 1.1.12'
 depends 'apt'

recipes/cephfs_install.rb

@@ -1,7 +1,11 @@
 include_recipe 'ceph'
 
 node['ceph']['cephfs']['packages'].each do |pck|
-  package pck
+  package pck do
+    action node['ceph']['package_action']
+    v = ceph_exactversion(pck)
+    version v if v
+  end
 end
 
 # Update the fuse.ceph helper for pre-firefly

recipes/conf.rb

@@ -1,5 +1,7 @@
 # fail 'mon_initial_members must be set in config' if node['ceph']['config']['mon_initial_members'].nil?
 
+include_recipe 'ceph'
+
 unless node['ceph']['config']['fsid']
   Chef::Log.warn('We are genereting a new uuid for fsid')
   require 'securerandom'
@@ -8,8 +10,8 @@
 end
 
 directory '/etc/ceph' do
-  owner 'root'
-  group 'root'
+  owner 'ceph'
+  group 'ceph'
   mode '0755'
   action :create
 end
@@ -22,5 +24,7 @@
       :is_rgw => node['ceph']['is_radosgw']
     }
   }
+  owner 'ceph'
+  group 'ceph'
   mode '0644'
 end

recipes/default.rb

@@ -1,9 +1,12 @@
 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
+  package pck do
+    action node['ceph']['package_action']
+  end
 end
 
+include_recipe 'ceph::conf'
+
 chef_gem 'netaddr'

recipes/install.rb

@@ -46,8 +46,10 @@
   end
 end
 
-packages.each do |pkg|
-  package pkg do
-    action :install
+packages.each do |pck|
+  package pck do
+    action node['ceph']['package_action']
+    v = ceph_exactversion(pck)
+    version v if v
   end
 end

recipes/mds.rb

@@ -23,8 +23,8 @@
 cluster = 'ceph'
 
 directory "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}" do
-  owner 'root'
-  group 'root'
+  owner node['ceph']['owner']
+  group node['ceph']['group']
   mode 00755
   recursive true
   action :create
@@ -34,6 +34,8 @@
   caps('osd' => 'allow *', 'mon' => 'allow rwx')
   keyname "mds.#{node['hostname']}"
   filename "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/keyring"
+  owner node['ceph']['owner']
+  group node['ceph']['group']
 end
 
 file "/var/lib/ceph/mds/#{cluster}-#{node['hostname']}/done" do
@@ -56,14 +58,16 @@
   mode 00644
 end
 
-service 'ceph_mds' do
-  case service_type
-  when 'upstart'
+if service_type == 'upstart'
+  service 'ceph_mds' do
     service_name 'ceph-mds-all-starter'
     provider Chef::Provider::Service::Upstart
-  else
-    service_name 'ceph'
   end
   action [:enable, :start]
   supports :restart => true
+elsif service_type == 'systemd'
+  unit = "ceph-mds@#{node['hostname']}.service"
+  systemd_unit unit do
+    action :enable
+  end
 end

recipes/mds_install.rb

@@ -1,5 +1,9 @@
 include_recipe 'ceph'
 
 node['ceph']['mds']['packages'].each do |pck|
-  package pck
+  package pck do
+    action node['ceph']['package_action']
+    v = ceph_exactversion(pck)
+    version v if v
+  end
 end

recipes/mgr.rb

@@ -0,0 +1,72 @@
+#
+# Author:: Jeremy Hanmer <[email protected]>
+# Cookbook Name:: ceph
+# Recipe:: mgr
+#
+# Copyright 2017, 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.
+
+include_recipe 'ceph'
+include_recipe 'ceph::mgr_install'
+
+cluster = 'ceph'
+
+directory "/var/lib/ceph/mgr/#{cluster}-#{node['hostname']}" do
+  owner 'root'
+  group 'root'
+  mode 00755
+  recursive true
+  action :create
+end
+
+ceph_client 'mgr' do
+  caps('osd' => 'allow *', 'mon' => 'allow profile mgr', 'mds' => 'allow *')
+  keyname "mgr.#{node['hostname']}"
+  filename "/var/lib/ceph/mgr/#{cluster}-#{node['hostname']}/keyring"
+  owner node['ceph']['owner']
+  group node['ceph']['group']
+end
+
+file "/var/lib/ceph/mgr/#{cluster}-#{node['hostname']}/done" do
+  owner 'root'
+  group 'root'
+  mode 00644
+end
+
+service_type = node['ceph']['osd']['init_style']
+
+case service_type
+when 'upstart'
+  filename = 'upstart'
+else
+  filename = 'sysvinit'
+end
+file "/var/lib/ceph/mgr/#{cluster}-#{node['hostname']}/#{filename}" do
+  owner 'root'
+  group 'root'
+  mode 00644
+end
+
+if service_type == 'upstart'
+  service 'ceph_mgr' do
+    service_name 'ceph-mgr'
+    action [:enable, :start]
+    supports :restart => true
+  end
+elsif service_type == 'systemd'
+  unit = "ceph-mgr@#{node['hostname']}.service"
+  systemd_unit unit do
+    action :enable
+  end
+end

recipes/mgr_install.rb

@@ -0,0 +1,9 @@
+include_recipe 'ceph'
+
+node['ceph']['mgr']['packages'].each do |pck|
+  package pck do
+    action node['ceph']['package_action']
+    v = ceph_exactversion(pck)
+    version v if v
+  end
+end