ohai 8.1.1 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bed93b1e75ac95ad62fa73b4b10e37c86cb775f
-  data.tar.gz: 18bc1a6d74bcf22a16c3b38c71c430d495cb8741
+  metadata.gz: c4fdcd52a082fc45f9b8290c5f9a0b235ad4ee8f
+  data.tar.gz: bdf90d6b5e6c9fd85d9ad4c441cf90e5d30fc3af
 SHA512:
-  metadata.gz: fed6e778677dfa6a62be62ceee315792205f174eeb3853c9deb225a4c467a22a02ddb113e3dc6a5f0e4d6013ff6d43c9b5231fa089adc6c5781990ef6d3759ef
-  data.tar.gz: 5f497f6b31404741e9a7a38fdbfc728de61c251baabdfb9bca41a2094fce7014e7d42e8271b0898e4869118b99cb3f906acb861518c95a972a25acd821d02481
+  metadata.gz: cf65d4334c84ae6d7f0fc28348370763d9f7b2f25cc5ca95fb9dfab6bca028c66f3be0884235ce6ea14b2b696494b150ac285af8e84358ebf652c41e8224fb08
+  data.tar.gz: f1d9cb9f4d98062ef81d1087fb02d6a261762d096ca5cdae6d643e5817019e1148614873d8bdd564e356ec520460116c6990e426619dbbab826b2bb99f0ac43d

data/README.md

@@ -1,4 +1,7 @@
 # ohai
+[![Build Status Master](https://travis-ci.org/chef/ohai.svg?branch=master)](https://travis-ci.org/chef/ohai)
+[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/ohai?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/ohai/branch/master)
+
 
 # DESCRIPTION:
 
@@ -57,7 +60,7 @@ Ohai has some Rake tasks for doing various things.
     rake package          # Build all the packages
     rake repackage        # Force a rebuild of the package files
     rake spec             # Run specs
-  
+
     ($VERSION is the current version, from the GemSpec in Rakefile)
 
 # LINKS:

data/lib/ohai/plugins/cloud.rb

@@ -24,7 +24,6 @@ Ohai.plugin(:Cloud) do
   depends "linode"
   depends "openstack"
   depends "azure"
-  depends "cloudstack"
   depends "digital_ocean"
 
   # Make top-level cloud hashes
@@ -217,45 +216,6 @@ Ohai.plugin(:Cloud) do
     cloud[:provider] = "azure"
   end
 
-  # ----------------------------------------
-  # cloudstack
-  # ----------------------------------------
-
-  # Is current cloud cloudstack-based?
-  #
-  # === Return
-  # true:: If cloudstack Hash is defined
-  # false:: Otherwise
-  def on_cloudstack?
-    cloudstack != nil
-  end
-
-  # Fill cloud hash with cloudstack values. Cloudstack is a bit different in that
-  # the local interface can be a public or private ip is using basic networking.
-  # When using advanced networking, the public_ipv4 passed in the metadata isn't
-  # usually going to be the public ip of the interface, so don't use that value. As
-  # per the Cloudstack documentation its actually the NAT router IP.
-  def get_cloudstack_values
-    cloud[:local_ipv4] = cloudstack['local_ipv4']
-
-    if cloudstack['local_ipv4']
-      # Private IPv4 address
-      if cloudstack['local_ipv4'] =~ /\A(10\.|192\.168\.|172\.1[6789]\.|172\.2.\.|172\.3[01]\.)/
-        cloud[:private_ips] << cloudstack['local_ipv4']
-        cloud[:public_ipv4] = nil
-      else
-        cloud[:public_ips] << cloudstack['local_ipv4']
-        # Yes, not a mistake, for basic networking this may be true
-        cloud[:public_ipv4] = cloudstack['local_ipv4']
-      end
-    end
-    cloud[:public_hostname] = cloudstack['public_hostname']
-    cloud[:local_hostname] = cloudstack['local_hostname']
-    cloud[:vm_id] = cloudstack['vm_id']
-    cloud[:local_hostname] = cloudstack['local_hostname']
-    cloud[:provider] = 'cloudstack'
-  end
-
   # ----------------------------------------
   # digital_ocean
   # ----------------------------------------
@@ -327,12 +287,6 @@ Ohai.plugin(:Cloud) do
       get_azure_values
     end
 
-    # setup cloudstack cloud
-    if on_cloudstack?
-      create_objects
-      get_cloudstack_values
-    end
-
     # setup digital_ocean cloud data
     if on_digital_ocean?
       create_objects

data/lib/ohai/plugins/perl.rb

@@ -35,10 +35,8 @@ Ohai.plugin(:Perl) do
           perl[:archname] = $1
         end
       end
-    end
-
-    if so.exitstatus == 0
       languages[:perl] = perl 
     end
+
   end
 end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '8.1.1'
+  VERSION = '8.2.0'
 end

data/spec/unit/plugins/cloud_spec.rb

@@ -29,7 +29,6 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:eucalyptus] = nil
       @plugin[:linode] = nil
       @plugin[:azure] = nil
-      @plugin[:cloudstack] = nil
       @plugin[:digital_ocean] = nil
       @plugin.run
       expect(@plugin[:cloud]).to be_nil
@@ -207,35 +206,6 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
-  describe "with cloudstack mash" do
-    before do
-      @plugin[:cloudstack] = Mash.new()
-    end
-
-    it "populates cloud public ip" do
-      @plugin[:cloudstack]['local_ipv4'] = "174.129.150.8"
-      @plugin.run
-      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:cloudstack]['local_ipv4'])
-    end
-
-    it "populates cloud private ip" do
-      @plugin[:cloudstack]['local_ipv4'] = "10.252.42.149"
-      @plugin.run
-      expect(@plugin[:cloud][:private_ips][0]).to eq(@plugin[:cloudstack]['local_ipv4'])
-    end
-
-    it "populates cloud provider" do
-      @plugin.run
-      expect(@plugin[:cloud][:provider]).to eq("cloudstack")
-    end
-
-    it "populates vm id" do
-      @plugin[:cloudstack]['vm_id'] = "8983fb85-fb7f-46d6-8af1-c1b6666fec39"
-      @plugin.run
-      expect(@plugin[:cloud][:vm_id]).to eq(@plugin[:cloudstack]['vm_id'])
-    end
-  end
-
   describe "with digital_ocean mash" do
     before do
       @plugin[:digital_ocean] = Mash.new
@@ -289,5 +259,4 @@ describe Ohai::System, "plugin cloud" do
       expect(@plugin[:cloud][:provider]).to eq("digital_ocean")
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.2.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -42,16 +42,22 @@ dependencies:
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: net-dhcp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +265,6 @@ files:
 - lib/ohai/loader.rb
 - lib/ohai/log.rb
 - lib/ohai/mash.rb
-- lib/ohai/mixin/cloudstack_metadata.rb
 - lib/ohai/mixin/command.rb
 - lib/ohai/mixin/constant_helper.rb
 - lib/ohai/mixin/ec2_metadata.rb
@@ -295,7 +286,6 @@ files:
 - lib/ohai/plugins/chef.rb
 - lib/ohai/plugins/cloud.rb
 - lib/ohai/plugins/cloud_v2.rb
-- lib/ohai/plugins/cloudstack.rb
 - lib/ohai/plugins/command.rb
 - lib/ohai/plugins/darwin/cpu.rb
 - lib/ohai/plugins/darwin/filesystem.rb
@@ -430,7 +420,6 @@ files:
 - spec/unit/dsl/plugin_spec.rb
 - spec/unit/hints_spec.rb
 - spec/unit/loader_spec.rb
-- spec/unit/mixin/cloudstack_metadata_spec.rb
 - spec/unit/mixin/command_spec.rb
 - spec/unit/mixin/ec2_metadata_spec.rb
 - spec/unit/plugins/aix/cpu_spec.rb
@@ -446,7 +435,6 @@ files:
 - spec/unit/plugins/chef_spec.rb
 - spec/unit/plugins/cloud_spec.rb
 - spec/unit/plugins/cloud_v2_spec.rb
-- spec/unit/plugins/cloudstack_spec.rb
 - spec/unit/plugins/darwin/cpu_spec.rb
 - spec/unit/plugins/darwin/hostname_spec.rb
 - spec/unit/plugins/darwin/kernel_spec.rb

data/lib/ohai/mixin/cloudstack_metadata.rb

@@ -1,88 +0,0 @@
-#
-# Author:: Olle Lundberg (<geek@nerd.sh>)
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'ohai/mixin/ec2_metadata'
-require 'ohai/hints'
-require 'net/dhcp'
-require 'socket'
-
-
-module Ohai
-  module Mixin
-    module CloudstackMetadata
-      include Ohai::Mixin::Ec2Metadata
-
-      def self.discover_dhcp_server
-        response = ''
-        if Ohai::Hints.hint?('cloudstack')
-          begin
-            request = DHCP::Discover.new
-
-            listensock = UDPSocket.new
-            sendsock   = UDPSocket.new
-
-            listensock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
-            sendsock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
-
-            sendsock.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
-            sendaddr   = "<broadcast>"
-            listenport = 68
-
-            listensock.bind('', listenport)
-            sendsock.connect(sendaddr, 67)
-
-            sendsock.send(request.pack, 0)
-
-            data = listensock.recvfrom_nonblock(1500)
-          rescue Exception => e
-            if (defined?(IO::WaitReadable) && e.instance_of?(IO::WaitReadable)) ||
-                (e.instance_of?(Errno::EAGAIN) || e.instance_of?(Errno::EWOULDBLOCK)) # This OR branch can be removed when ruby > 1.8.7
-              unless IO.select([listensock], nil, nil, 10)
-                # timeout reached
-                Ohai::Log.debug("Timeout reached awaiting response from DHCP server")
-              else
-                # try to read from the socket again
-                data = listensock.recvfrom_nonblock(1500)
-              end
-            else
-              Ohai::Log.debug("Exceptions encountered when trying to connect to dhcp server. #{e.message}")
-            end
-          ensure
-            sendsock.close
-            listensock.close
-            if data
-              response = [DHCP::Message.from_udp_payload(data[0]).siaddr].pack('N').unpack('C4').join('.')
-            end
-          end
-        end
-        response
-      end
-
-      CLOUDSTACK_METADATA_ADDR = self.discover_dhcp_server unless defined?(CLOUDSTACK_METADATA_ADDR)
-
-      def http_client
-        Net::HTTP.start(CLOUDSTACK_METADATA_ADDR).tap { |h| h.read_timeout = 600 }
-      end
-
-      def best_api_version
-        'latest'
-      end
-
-    end
-  end
-end
-

data/lib/ohai/plugins/cloudstack.rb

@@ -1,50 +0,0 @@
-#
-# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
-# Author:: Olle Lundberg (<geek@nerd.sh>)
-# Copyright:: Copyright (c) 2010-2014 RightScale Inc
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'ohai/mixin/cloudstack_metadata'
-
-Ohai.plugin(:Cloudstack) do
-  provides "cloudstack"
-
-  include Ohai::Mixin::CloudstackMetadata
-
-  collect_data do
-    # Adds cloudstack Mash
-    if hint?('cloudstack')
-      Ohai::Log.debug("found 'cloudstack' hint. Will try to connect to the metadata server")
-
-      if can_metadata_connect?(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR, 80)
-        cloudstack Mash.new
-        Ohai::Log.debug("connecting to the 'cloudstack' metadata service")
-        fetch_metadata.each { |k, v| cloudstack[k] = v }
-        # Note: the cloudstack public_ipv4 is the value of the NAT router (as per cloudstack documentation)
-        # and not necessarily the publicly available IP.  cloustack semi-supports floating
-        # ips in that the public ip for an instance can be an IP different from the NAT router
-        cloudstack['router_ipv4'] = cloudstack.delete('public_ipv4')
-        cloudstack['dhcp_lease_provider_ip'] = dhcp_ip
-      else
-        Ohai::Log.debug("unable to connect to the 'cloudstack' metadata service")
-      end
-    else
-      Ohai::Log.debug("unable to find 'cloudstack' hint. Won't connect to the metadata server.")
-    end
-  end
-end
-
-

data/spec/unit/mixin/cloudstack_metadata_spec.rb

@@ -1,33 +0,0 @@
-#
-# Author:: Olle Lundberg (<geek@nerd.sh>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDIT"Net::HTTP Response"NS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-require 'ohai/mixin/cloudstack_metadata'
-
-describe Ohai::Mixin::CloudstackMetadata do
-  let(:mixin) {
-    metadata_object = Object.new.extend(Ohai::Mixin::CloudstackMetadata)
-    metadata_object
-  }
-
-  context "#best_api_version" do
-    it "returns the string latest" do
-      expect(mixin.best_api_version).to eq("latest")
-    end
-  end
-end

data/spec/unit/plugins/cloudstack_spec.rb

@@ -1,155 +0,0 @@
-#
-# Author:: Olle Lundberg (<geek@nerd.sh>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDIT"Net::HTTP Response"NS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'ohai/plugins/cloudstack'
-
-describe "Cloudstack Plugin" do
-
-  let(:cloudstack_hint) { false }
-
-  let(:ohai_system) { Ohai::System.new }
-  let(:ohai_data) { ohai_system.data }
-
-  let(:cloudstack_plugin) do
-    plugin = get_plugin("cloudstack", ohai_system)
-    allow(plugin).to receive(:hint?).with("cloudstack").and_return(cloudstack_hint)
-    plugin
-  end
-
-  before do
-    stub_const("Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR", '10.10.10.10')
-  end
-
-  context "when there is no relevant hint" do
-
-    it "does not set any cloudstack data" do
-      cloudstack_plugin.run
-      expect(ohai_data).to_not have_key("cloudstack")
-    end
-
-  end
-
-  context "when there is a `cloudstack` hint" do
-    let(:cloudstack_hint) { true }
-
-    context "and the metadata service is not available" do
-
-      before do
-        expect(cloudstack_plugin).to receive(:can_metadata_connect?).
-          with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR,80).
-          and_return(false)
-      end
-
-      it "does not set any cloudstack data" do
-        cloudstack_plugin.run
-        expect(ohai_data).to_not have_key("cloudstack")
-      end
-    end
-
-    context "and the metadata service is available" do
-
-      let(:metadata_version) { "latest" }
-
-      let(:metadata_root) do
-        <<EOM
-availability-zone
-cloud-identifier
-instance-id
-local-hostname
-local-ipv4
-public-hostname
-public-ipv4
-service-offering
-vm-id
-EOM
-      end
-
-      let(:metadata_values) do
-        {
-          "local-ipv4" =>"10.235.34.23",
-          "local-hostname" =>"VM-8983fb85-fb7f-46d6-8af1-c1b6666fec39",
-          "public-hostname" =>"awesome-doge",
-          "availability-zone" =>"TCS7",
-          "service-offering" =>"2vCPU, 1GHz, 2GB RAM",
-          "public-ipv4" =>"10.235.34.23",
-          "vm-id"=>"8983fb85-fb7f-46d6-8af1-c1b6666fec39",
-          "cloud-identifier"=>"CloudStack-{e84ff39d-ef64-4812-a8a9-7932f7b67f17}",
-          "instance-id"=>"8983fb85-fb7f-46d6-8af1-c1b6666fec39"
-        }
-      end
-
-      let(:http_client) { double("Net::HTTP", :read_timeout= => nil) }
-
-      def expect_get(url, response_body)
-        expect(http_client).to receive(:get).
-          with(url).
-          and_return(double("HTTP Response", :code => "200", :body => response_body))
-      end
-
-      before do
-        expect(cloudstack_plugin).to receive(:can_metadata_connect?).
-          with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR,80).
-          and_return(true)
-
-        allow(Net::HTTP).to receive(:start).
-          with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR).
-          and_return(http_client)
-
-        allow(cloudstack_plugin).to receive(:best_api_version).and_return(metadata_version)
-
-        expect_get("/#{metadata_version}/meta-data/", metadata_root)
-
-        metadata_values.each do |md_id, md_value|
-          expect_get("/#{metadata_version}/meta-data/#{md_id}", md_value)
-        end
-
-        cloudstack_plugin.run
-      end
-
-     it "reads the local ipv4 from the metadata service" do
-        expect(ohai_data['cloudstack']['local_ipv4']).to eq("10.235.34.23")
-      end
-     it "reads the local hostname from the metadata service" do
-        expect(ohai_data['cloudstack']['local_hostname']).to eq("VM-8983fb85-fb7f-46d6-8af1-c1b6666fec39")
-      end
-     it "reads the public hostname from the metadata service" do
-        expect(ohai_data['cloudstack']['public_hostname']).to eq("awesome-doge")
-      end
-     it "reads the availability zone from the metadata service" do
-        expect(ohai_data['cloudstack']['availability_zone']).to eq("TCS7")
-      end
-     it "reads the service offering from the metadata service" do
-        expect(ohai_data['cloudstack']['service_offering']).to eq("2vCPU, 1GHz, 2GB RAM")
-      end
-     it "reads the public ipv4 from the metadata service" do
-        expect(ohai_data['cloudstack']['router_ipv4']).to eq("10.235.34.23")
-      end
-     it "reads the vm id from the metadata service" do
-        expect(ohai_data['cloudstack']['vm_id']).to eq("8983fb85-fb7f-46d6-8af1-c1b6666fec39")
-      end
-     it "reads the cloud identifier from the metadata service" do
-        expect(ohai_data['cloudstack']['cloud_identifier']).to eq("CloudStack-{e84ff39d-ef64-4812-a8a9-7932f7b67f17}")
-      end
-     it "reads the instance id from the metadata service" do
-        expect(ohai_data['cloudstack']['instance_id']).to eq("8983fb85-fb7f-46d6-8af1-c1b6666fec39")
-      end
-    end
-  end
-end
-