ohai 7.0.0.rc.2 → 7.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 533f13f1b7eb1ff6e7dd001f5ca234c6332db38c
-  data.tar.gz: 440b071fec79b90937919a22f1182e717a41234e
+  metadata.gz: cdf35511e9eb60b6d08168730774fa4b5dfe862d
+  data.tar.gz: f6f47ef693511a5e65101366ae5bfc9213b925b2
 SHA512:
-  metadata.gz: 54ed83d812f3c567ba2da77867eedfe269d8914a200cac7922d6c7ff05a05e2ee95a27d5af6f06a26f94052bbf244ae3494f2bd682b6b746aa4f2cd1dc259c3f
-  data.tar.gz: b66322b8b5d3acf70e43f3efb39ae8a25da7b56cc3be84f5d2d46802908fb13bf908a9227852e51cbc7ffd876184d7e382eaf5f5d3600157e07cdcd37f6fea2b
+  metadata.gz: b193999564638067a25ab8a6fb63004cbd0a42a32f2018635aeb2212bee18e2aab7030b7dec75ad0cbd9603ad200176202668ede9c61c195d7bd811334cd49bc
+  data.tar.gz: b2d312b317e51911b05a3588de31363cb3e5a8adbbb06d0dc7b2beafcb5b7489cadce751f9791f3528428055bbd53c8ca8bbcc6a710bcaca56ffdf244876d51a

data/lib/ohai/plugins/linux/virtualization.rb

@@ -146,10 +146,10 @@ Ohai.plugin(:Virtualization) do
     # Full notes, https://tickets.opscode.com/browse/OHAI-551
     # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
     if File.exists?("/proc/self/cgroup")
-      if File.read("/proc/self/cgroup") =~ %r{^\d+:.+:/lxc/.+$}
+      if File.read("/proc/self/cgroup") =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$}
         virtualization[:system] = "lxc"
         virtualization[:role] = "guest"
-      elsif File.read("/proc/self/cgroup") =~ %r{\d:.+:/$}
+      elsif File.read("/proc/self/cgroup") =~ %r{\d:[^:]+:/$}
         virtualization[:system] = "lxc"
         virtualization[:role] = "host"
       end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.0.0.rc.2'
+  VERSION = '7.0.0.rc.3'
 end

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -300,7 +300,27 @@ CGROUP
       @plugin[:virtualization][:role].should == "guest"
     end
 
-    it "should set not set anyting if /proc/self/cgroup exist and the cgroup is named arbitrarily, it isn't necessarily lxc." do
+    it "should set lxc guest if /proc/self/cgroup exist and there are /docker/<name> mounts" do
+      self_cgroup=<<-CGROUP
+11:hugetlb:/
+10:perf_event:/
+9:blkio:/
+8:net_cls:/
+7:freezer:/
+6:devices:/
+5:memory:/
+4:cpuacct,cpu:/docker/9c2adaa4c391ec0d3bf994fbd91ff30c3d317694d179e5b1dc7e1e4c8ed56b61
+3:cpuset:/
+2:name=systemd:/system.slice/docker.service
+CGROUP
+      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      @plugin.run
+      @plugin[:virtualization][:system].should == "lxc"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should set not set anything if /proc/self/cgroup exist and the cgroup is named arbitrarily, it isn't necessarily lxc." do
       self_cgroup=<<-CGROUP
 8:blkio:/Charlie
 7:net_cls:/Charlie

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc.2
+  version: 7.0.0.rc.3
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types