diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-03-01 12:27:32 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-03-01 12:27:32 -0800 |
commit | ba81b5ce825477fcb8b4e9684337c7f666b0f6e3 (patch) | |
tree | 46cafd73362058baf8d27ad0f477a7f3cb01f645 | |
parent | b22a637d40f991a4abd349db6c123de1dd388801 (diff) | |
download | ohai-ba81b5ce825477fcb8b4e9684337c7f666b0f6e3.tar.gz |
Resolve Chefstyle warnings
-rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 4 | ||||
-rw-r--r-- | spec/unit/plugins/linux/virtualization_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index 132e38a2..189bf444 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -34,7 +34,7 @@ Ohai.plugin(:Virtualization) do end def nova_exists? - which('nova') + which("nova") end collect_data(:linux) do @@ -175,7 +175,7 @@ Ohai.plugin(:Virtualization) do if File.exist?("/proc/self/cgroup") cgroup_content = File.read("/proc/self/cgroup") if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} || - cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$} + cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$} virtualization[:system] = $1 virtualization[:role] = "guest" virtualization[:systems][$1.to_sym] = "guest" diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb index 9ec7594f..cb148acd 100644 --- a/spec/unit/plugins/linux/virtualization_spec.rb +++ b/spec/unit/plugins/linux/virtualization_spec.rb @@ -84,7 +84,7 @@ describe Ohai::System, "Linux virtualization platform" do describe "when we are checking for openstack" do it "sets openstack host if nova binary exists" do - allow(plugin).to receive(:nova_exists?).and_return('/usr/bin/nova') + allow(plugin).to receive(:nova_exists?).and_return("/usr/bin/nova") plugin.run expect(plugin[:virtualization][:system]).to eq("openstack") expect(plugin[:virtualization][:role]).to eq("host") |