Merge remote-tracking branch 'github/pull/272'

[chef.git] / cookbooks / hardware / recipes / default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index efe8f3b483cddf8e33253ba0e00b83976c0ad4d3..fa5f43c648f33f2ec2dd3e7cd554573a619dcc8e 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -17,8 +17,11 @@
 # 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"
@@ -94,15 +97,22 @@ when "IBM"
 when "VMware, Inc."
   package "open-vm-tools"
 
-  service "open-vm-tools" do
-    action [:enable, :start]
-    supports :status => true, :restart => true
+  # 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
 
-  # May need additional work per:
-  # https://github.com/vmware/open-vm-tools/issues/302
+  # 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
 
@@ -252,6 +262,7 @@ if tools_packages.include?("areca")
     repository "https://git.openstreetmap.org/private/areca.git"
     user "root"
     group "root"
+    not_if { ENV["TEST_KITCHEN"] }
   end
 else
   directory "/opt/areca" do