onering-report 0.6.10 → 0.6.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODk4NDhjZjI3Y2QyZDMzMDcxOTg4MTE4ZjcxMWM5MGNiYzhlNjc3OA==
+    YWYxMzU3MDY5YTVmNTVmNzU3MWI5M2NmYzMxNzBiOGRhMzA4YzMyMg==
   data.tar.gz: !binary |-
-    M2I4YmIxMmRhZDBjYTBmZTYxNWZmY2VhYzkzNDZhNDkzN2M4NTEwZQ==
+    MGI2ODAyZGY5ZWQyNDg0NWFiMTUzMGQxNjUxMDMyNjlmZWE3ZTQyZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTc3NWYwZDhjZTEyYmM1ODE1NzljMTMxNjFmYTQ5YjUxM2RjYzA1OTFlNmQ2
-    ZGI2N2ExOTBjY2Y2Mzg5MGE4OTlkMWEzMGJlOGFmMjk0NjNkYTA0MGY0MDM3
-    OGEyZTE3MWVjZTI2ODA3OWVlYWU4ZGU2OTBhNjg2Zjg5NjRhYzU=
+    MDU0Y2YwNGJmNTE2MDRiOGE5ZDI1YjgxMDAxZGZhNGVhODYxZGY1MWQ3NDkz
+    MzU1Yzc3Nzc1YTA2MzJhMTYyYmJjODkyNWE0YjBjOThlOTEyMmM0NjYxN2Ji
+    ODM3YzgxMThhOGQ0MGRlNjMwYzAwZWYwOTExMTM0OTQ5OTMxNzA=
   data.tar.gz: !binary |-
-    YWM1MDNiNmI0Yzk4NjRlM2Q4NzA1MjI4OGY5MDk5ZjZmNDUxZTZiYjJmZDg4
-    NGVjY2ZiZmY0NTRmYWFjNmYwMTQ3MzJjYTllMTdhYWRiMjE3NWUwMzMyMGIx
-    NDZmNDEzNDI1ODNjNTM3MTI2MDYyYzRiYmE0OGNmNTcwNDA5OWU=
+    YjdiNTgzZmQyZDA3NzMwZmFiMzNkZWI0NTQzMWEyMTY1MTk1Mzk0N2YxNDcw
+    ZTZhYTVkYjQxMzYxNTYxNzRhYmU1NjU4ZDgxMGFkNDIwODg1MjJlNGQ5ZDY1
+    OWU5YWUwNzBkOTBiNmE2YWI0NjU5YzkzYzg1ZDNlZDVlZWM1Zjc=

data/lib/facter/onering_properties_physical.rb

@@ -1,5 +1,30 @@
 require 'timeout'
 
+def count_ipmi_instances(cmd)
+  Dir['/proc/[0-9]*/cmdline'].select {|p| File.read(p).include?(cmd)}.count
+end
+
+ALLOWED_IPMI = 5
+
+def ipmi_ok?
+  begin
+    ipmi = IPMI_PATH if defined? IPMI_PATH 
+    ipmi ||= 'ipmiutil'
+    if count_ipmi_instances('ipmitool') > ALLOWED_IPMI
+	$stderr.puts "More then #{ALLOWED_IPMI} #{ipmi} instances found"
+	return false
+    end
+    Timeout::timeout(30) {
+	Facter::Util::Resolution.exec("#{ipmi} health 2> /dev/null | tail -n1 | grep failed").nil?
+    }
+    return true
+  rescue Timeout::Error
+    $stderr.puts "timed out while running #{ipmi}"
+    false
+  end
+end
+
+
 Facter.add('site') do
   setcode do
     if File.size?('/etc/onering/static/site')
@@ -50,29 +75,6 @@ Facter.add('slot') do
   end
 end
 
-def count_ipmi_instances(cmd)
-  Dir['/proc/[0-9]*/cmdline'].select {|p| File.read(p).include?(cmd)}.count
-end
-
-ALLOWED_IPMI = 5
-
-def ipmi_ok?
-  begin
-    ipmi = IPMI_PATH if defined? IPMI_PATH 
-    ipmi ||= 'ipmiutil'
-    if count_ipmi_instances('ipmitool') > ALLOWED_IPMI
-	$stderr.puts "More then #{ALLOWED_IPMI} #{ipmi} instances found"
-	return false
-    end
-    Timeout::timeout(30) {
-	Facter::Util::Resolution.exec("#{ipmi} health 2> /dev/null | tail -n1 | grep failed").nil?
-    }
-  rescue Timeout::Error
-    $stderr.puts "timed out while running #{ipmi}"
-    false
-  end
-end
-
 if ipmi_ok?
   ipmi_lan = Facter::Util::Resolution.exec("ipmitool lan print 1 2> /dev/null")
 

data/onering-report.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = 'onering-report'
-  gem.version       = '0.6.10'
+  gem.version       = '0.6.11'
   gem.authors       = ['rnarkis']
   gem.email         = ['rnarkis@outbrain.com']
   gem.description   = %q{Onering facter facts}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-report
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - rnarkis