Touch XML files to reflect date of original RRD file. Don't run dump in parallel...

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index f9f76cd46dc11fadc87f3e7d2fdb98d9ef22a58f..9dd3c0a6a7e18f197dbb83b57f347be5f7f92e76 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -52,8 +52,6 @@ units = []
 
 if node[:roles].include?("bytemark") || node[:roles].include?("exonetric")
   units << "0"
 
 if node[:roles].include?("bytemark") || node[:roles].include?("exonetric")
   units << "0"

-elsif node[:roles].include?("ovh")
-  units << "2"

 end
 
 case manufacturer
 end
 
 case manufacturer


@@ -80,7 +78,7 @@ when "TYAN Computer Corporation"
   units << "0"
 when "Supermicro"
   case product
   units << "0"
 when "Supermicro"
   case product

-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-2028U-TN24R4T+"
+  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-2028U-TN24R4T+", "Super Server"

     units << "1"
   else
     units << "0"
     units << "1"
   else
     units << "0"


@@ -203,6 +201,13 @@ if node[:lsb][:release].to_f >= 12.10
   end
 end
 
   end
 end
 

+# Link Layer Discovery Protocol Daemon
+package "lldpd"
+service "lldpd" do
+  action [:start, :enable]
+  supports :status => true, :restart => true, :reload => true
+end
+

 tools_packages = []
 status_packages = {}
 
 tools_packages = []
 status_packages = {}