summaryrefslogtreecommitdiff
path: root/lib/ohai/plugins/joyent.rb
diff options
context:
space:
mode:
authorsawanoboly <sawanoboriyu@higanworks.com>2014-05-23 08:57:45 +0000
committersawanoboly <sawanoboriyu@higanworks.com>2014-05-23 08:57:45 +0000
commit0f8b84b65a6d1b37b6a9d969bf11f5ab0a84144b (patch)
tree2b3eac255075ee03ff9d079032bec3e8960e4236 /lib/ohai/plugins/joyent.rb
parent744ba09081c95873ac096d72b3bc6427783ee62e (diff)
downloadohai-0f8b84b65a6d1b37b6a9d969bf11f5ab0a84144b.tar.gz
move .collect_guest_id from joyent to solaris2/virtualization
Diffstat (limited to 'lib/ohai/plugins/joyent.rb')
-rw-r--r--lib/ohai/plugins/joyent.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/ohai/plugins/joyent.rb b/lib/ohai/plugins/joyent.rb
index f0768ea9..63e7c3c1 100644
--- a/lib/ohai/plugins/joyent.rb
+++ b/lib/ohai/plugins/joyent.rb
@@ -26,13 +26,6 @@ Ohai.plugin(:Joyent) do
provides 'virtualization/guest_id'
depends 'os', 'platform', 'virtualization'
-
- def collect_solaris_guestid
- command = '/usr/sbin/zoneadm list -p'
- so = shell_out(command)
- so.stdout.split(':').first
- end
-
def collect_product_file
lines = []
if ::File.exists?("/etc/product")
@@ -67,7 +60,6 @@ Ohai.plugin(:Joyent) do
# get zone id unless globalzone
unless joyent[:sm_uuid] == "global"
- virtualization[:guest_id] = collect_solaris_guestid
joyent[:sm_id] = virtualization[:guest_id]
end