ohai 13.9.2 → 13.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f400446fd8d86f4e2985744e12ca32a7b85859c7817edf01cdf9e5c79dbc8a1
-  data.tar.gz: 7fc73a4140957c5c78fb3c5a314275c99da0b7615cc5b208f7899727b7004f94
+  metadata.gz: 4cd47e40a9d7e2877d2422f47a12fce95026eb3ed7670e40bb82d8b9a398007f
+  data.tar.gz: ae75e45d6f59c30f0abfc4e74f6af12a771edfd36f6d9acf41ea54ead46a8402
 SHA512:
-  metadata.gz: 594b82a931b294a8fdca9eb9bb866013d70e7601bc09bf1e8a99410223470fcb981bc83294092ec4dacb961d9502c80c6451bb1362b1e16300d7bef1950808d7
-  data.tar.gz: 68a89b951d8f5135e94098fef59125ef4fb011b9ec6912efaafcb09a1a069063391e44031714cb2d3e648b01c5697072059d726aefa5ef484d3c7c640244aeaf
+  metadata.gz: 926724f586f794cef84f2f95efe705e09a7a953dfb050502571039a4bedf871c3cb89a128e34453fe2e3d5887ec1f18904a418398ca58640728ef8d5668a0e24
+  data.tar.gz: 0f3a7b330e5c23c25e02fe383692aa7bc57280dc94aec1b641fae36318546dc7c72d58c2bb0b30a5ec5b0fd5a1cbfa0887f41601723179499103e192f0470631

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

@@ -24,8 +24,14 @@ Ohai.plugin(:Platform) do
     contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
   end
 
+  # Amazon Linux AMI release 2013.09
+  # Amazon Linux 2
+  # Fedora release 28 (Twenty Eight)
+  # CentOS release 5.8 (Final)
+  # CentOS release 6.7 (Final)
+  # Red Hat Enterprise Linux Server release 7.5 (Maipo)
   def get_redhatish_version(contents)
-    contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
+    contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/(release)? ([\d\.]+)/, 2]
   end
 
   #

data/lib/ohai/plugins/openstack.rb

@@ -32,6 +32,9 @@ Ohai.plugin(:Openstack) do
     if get_attribute(:dmi, :system, :all_records, 0, :Manufacturer) =~ /OpenStack/
       Ohai::Log.debug("Plugin Openstack: has_openstack_dmi? == true")
       true
+    elsif get_attribute(:dmi, :system, :product_name) == "OpenStack Compute"
+      logger.trace("Plugin Openstack: has_openstack_dmi? == true")
+      true
     else
       Ohai::Log.debug("Plugin Openstack: has_openstack_dmi? == false")
       false

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "13.9.2"
+  VERSION = "13.10.0"
 end

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

@@ -458,6 +458,22 @@ OS_RELEASE
         expect(@plugin[:platform_version].to_f).to eq(7.3)
       end
 
+      it "should read the platform as amazon and version as 2 on the RC release" do
+        expect(File).to receive(:read).with("/etc/redhat-release").and_return("Amazon Linux release 2 (2017.12) LTS Release Candidate")
+        @plugin.run
+        expect(@plugin[:platform]).to eq("amazon")
+        expect(@plugin[:platform_family]).to eq("amazon")
+        expect(@plugin[:platform_version].to_f).to eq(2)
+      end
+
+      it "should read the platform as amazon and version as 2 on the final release" do
+        expect(File).to receive(:read).with("/etc/redhat-release").and_return("Amazon Linux 2")
+        @plugin.run
+        expect(@plugin[:platform]).to eq("amazon")
+        expect(@plugin[:platform_family]).to eq("amazon")
+        expect(@plugin[:platform_version].to_f).to eq(2)
+      end
+
       # https://github.com/chef/ohai/issues/560
       # Issue is seen on EL7, so that's what we're testing.
       context "on versions that have /etc/os-release" do

data/spec/unit/plugins/openstack_spec.rb

@@ -40,16 +40,35 @@ describe Ohai::System, "plugin openstack" do
         allow(plugin).to receive(:can_socket_connect?).
           with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80).
           and_return(false)
-        plugin[:dmi] = { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
+        plugin[:dmi] = dmi_data
         plugin.run
       end
 
-      it "sets openstack attribute" do
-        expect(plugin[:openstack][:provider]).to eq("openstack")
+      context "with normal openstack metadata" do
+        let(:dmi_data) do
+          { :system => { :all_records => [ { :Manufacturer => "OpenStack Foundation" } ] } }
+        end
+
+        it "sets openstack attribute" do
+          expect(plugin[:openstack][:provider]).to eq("openstack")
+        end
+
+        it "doesn't set metadata attributes" do
+          expect(plugin[:openstack][:instance_id]).to be_nil
+        end
       end
+      context "with Red Hat openstack metadata" do
+        let(:dmi_data) do
+          { :system => { :manufacturer => "Red Hat", :product_name => "OpenStack Compute" } }
+        end
 
-      it "doesn't set metadata attributes" do
-        expect(plugin[:openstack][:instance_id]).to be_nil
+        it "sets openstack attribute" do
+          expect(plugin[:openstack][:provider]).to eq("openstack")
+        end
+
+        it "doesn't set metadata attributes" do
+          expect(plugin[:openstack][:instance_id]).to be_nil
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.9.2
+  version: 13.10.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -543,7 +543,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON