# limitations under the License.
#
-include_recipe "tools"
+include_recipe "apt"
+include_recipe "git"
include_recipe "munin"
+include_recipe "sysfs"
+include_recipe "tools"
ohai_plugin "hardware" do
template "ohai.rb.erb"
end
when "IBM"
units << "0"
+when "VMware, Inc."
+ package "open-vm-tools"
+
+ # Remove timeSync plugin completely
+ # https://github.com/vmware/open-vm-tools/issues/302
+ file "/usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so" do
+ action :delete
+ notifies :restart, "service[open-vm-tools]"
+ end
+
+ # Attempt to tell Host we are not interested in timeSync
+ execute "vmware-toolbox-cmd-timesync-disable" do
+ command "/usr/bin/vmware-toolbox-cmd timesync disable"
+ ignore_failure true
+ end
+
+ service "open-vm-tools" do
+ action [:enable, :start]
+ supports :status => true, :restart => true
+ end
end
units.sort.uniq.each do |unit|
tools_packages = []
status_packages = {}
-node[:kernel][:modules].each_key do |modname|
- case modname
- when "cciss"
- tools_packages << "ssacli"
- status_packages["cciss-vol-status"] ||= []
- when "hpsa"
- tools_packages << "ssacli"
- status_packages["cciss-vol-status"] ||= []
- when "mptsas"
- tools_packages << "lsiutil"
- status_packages["mpt-status"] ||= []
- when "mpt2sas", "mpt3sas"
- tools_packages << "sas2ircu"
- status_packages["sas2ircu-status"] ||= []
- when "megaraid_mm"
- tools_packages << "megactl"
- status_packages["megaraid-status"] ||= []
- when "megaraid_sas"
- tools_packages << "megacli"
- status_packages["megaclisas-status"] ||= []
- when "aacraid"
- tools_packages << "arcconf"
- status_packages["aacraid-status"] ||= []
- when "arcmsr"
- tools_packages << "areca"
+if node[:virtualization][:role] != "guest" ||
+ node[:virtualization][:system] != "lxd"
+
+ node[:kernel][:modules].each_key do |modname|
+ case modname
+ when "cciss"
+ tools_packages << "ssacli"
+ status_packages["cciss-vol-status"] ||= []
+ when "hpsa"
+ tools_packages << "ssacli"
+ status_packages["cciss-vol-status"] ||= []
+ when "mptsas"
+ tools_packages << "lsiutil"
+ status_packages["mpt-status"] ||= []
+ when "mpt2sas", "mpt3sas"
+ tools_packages << "sas2ircu"
+ status_packages["sas2ircu-status"] ||= []
+ when "megaraid_mm"
+ tools_packages << "megactl"
+ status_packages["megaraid-status"] ||= []
+ when "megaraid_sas"
+ tools_packages << "megacli"
+ status_packages["megaclisas-status"] ||= []
+ when "aacraid"
+ tools_packages << "arcconf"
+ status_packages["aacraid-status"] ||= []
+ when "arcmsr"
+ tools_packages << "areca"
+ end
end
-end
-node[:block_device].each do |name, attributes|
- next unless attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME"
+ node[:block_device].each do |name, attributes|
+ next unless attributes[:vendor] == "HP" && attributes[:model] == "LOGICAL VOLUME"
- if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
- status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"]
- else
- Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
- status_packages["cciss-vol-status"] |= [File.basename(sg)]
+ if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
+ status_packages["cciss-vol-status"] |= ["cciss/#{Regexp.last_match[1]}d0"]
+ else
+ Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+ status_packages["cciss-vol-status"] |= [File.basename(sg)]
+ end
end
end
end
git "/opt/areca" do
action :sync
repository "https://git.openstreetmap.org/private/areca.git"
+ depth 1
user "root"
group "root"
+ not_if { ENV["TEST_KITCHEN"] }
end
else
directory "/opt/areca" do
no_new_privileges true
notifies :restart, "service[cciss-vol-statusd]"
end
+else
+ systemd_service "cciss-vol-statusd" do
+ action :delete
+ end
+
+ template "/usr/local/bin/cciss-vol-statusd" do
+ action :delete
+ end
end
%w[cciss-vol-status mpt-status sas2ircu-status megaraid-status megaclisas-status aacraid-status].each do |status_package|
[]
end
-intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ }
-
-nvmes = if node[:hardware][:pci]
- node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" }
- else
- []
- end
-
-intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
-
-if !intel_ssds.empty? || !intel_nvmes.empty?
- package "unzip"
-
- intel_ssd_tool_version = "3.0.19"
-
- remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
- source "https://downloadmirror.intel.com/28639/eng/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip"
- end
-
- execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
- command "unzip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip isdct_#{intel_ssd_tool_version}-1_amd64.deb"
- cwd Chef::Config[:file_cache_path]
- user "root"
- group "root"
- not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") }
- end
-
- dpkg_package "isdct" do
- version "#{intel_ssd_tool_version}-1"
- source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb"
- end
-end
+# intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ }
+#
+# nvmes = if node[:hardware][:pci]
+# node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" }
+# else
+# []
+# end
+#
+# intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
+#
+# if !intel_ssds.empty? || !intel_nvmes.empty?
+# package "unzip"
+#
+# intel_ssd_tool_version = "3.0.21"
+#
+# remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
+# source "https://downloadmirror.intel.com/29115/eng/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip"
+# end
+#
+# execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
+# command "unzip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip isdct_#{intel_ssd_tool_version}-1_amd64.deb"
+# cwd Chef::Config[:file_cache_path]
+# user "root"
+# group "root"
+# not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") }
+# end
+#
+# dpkg_package "isdct" do
+# version "#{intel_ssd_tool_version}-1"
+# source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb"
+# end
+# end
disks = disks.map do |disk|
next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status])
end
if node[:hardware][:shm_size]
+ execute "remount-dev-shm" do
+ action :nothing
+ command "/bin/mount -o remount /dev/shm"
+ user "root"
+ group "root"
+ end
+
mount "/dev/shm" do
- action [:mount, :enable]
+ action :enable
device "tmpfs"
fstype "tmpfs"
options "rw,nosuid,nodev,size=#{node[:hardware][:shm_size]}"
+ notifies :run, "execute[remount-dev-shm]"
end
end
projects / chef.git / blobdiff