diff options
| author | Thom May <thom@may.lt> | 2016-11-30 09:51:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 09:51:51 +0000 |
| commit | 51ac6d9ddfe65bf8401ce999cdb3ff48efed22c3 (patch) | |
| tree | eefea0dc7c36ac799700df04cfe10a4ea3b89d14 | |
| parent | 9ab214367563c26ab839838a9287bbf04a33efb5 (diff) | |
| parent | 5b738c3b07d564acdce9c559352384c9e78e94f8 (diff) | |
| download | ohai-51ac6d9ddfe65bf8401ce999cdb3ff48efed22c3.tar.gz | |
Merge pull request #908 from numericillustration/master
fix for #891 to detect the global zone of a Solaris system as a Virt …
| -rw-r--r-- | lib/ohai/plugins/solaris2/virtualization.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb index bca7b6eb..c43dd3f2 100644 --- a/lib/ohai/plugins/solaris2/virtualization.rb +++ b/lib/ohai/plugins/solaris2/virtualization.rb @@ -74,7 +74,11 @@ Ohai.plugin(:Virtualization) do if zones.length == 1 first_zone = zones.keys[0] - unless first_zone == "global" + if first_zone == "global" + virtualization[:system] = "zone" + virtualization[:role] = "host" + virtualization[:systems][:zone] = "host" + else virtualization[:system] = "zone" virtualization[:role] = "guest" virtualization[:systems][:zone] = "guest" |