diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-17 17:03:18 -0600 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-17 17:03:18 -0600 |
| commit | f6310de672d9ee2e634b7fb8b9bf0fbc331b020f (patch) | |
| tree | f6b262c64c6f5530cce2976f3b61e6d3ab9be472 | |
| parent | 7b6e346e78c1ebf27e48353a7cd6d2e2313e80ad (diff) | |
| parent | a382b3ce9c260f5a2b52e2bcce33ad57efbba596 (diff) | |
| download | ohai-f6310de672d9ee2e634b7fb8b9bf0fbc331b020f.tar.gz | |
Merge pull request #489 from chef/jdm/fix
Ohai 8.1 is broken
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | lib/ohai/plugins/digital_ocean.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/util/ip_helper.rb | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ac384a9f..fa1af3dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,6 @@ rvm: - 1.9.3 - 2.0.0 - 2.1.2 -script: bundle exec rake spec +script: + - bundle exec rake spec + - bundle exec ohai diff --git a/appveyor.yml b/appveyor.yml index ea82eb56..83e19722 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,3 +30,4 @@ build_script: test_script: - bundle exec rspec + - bundle exec ohai diff --git a/lib/ohai/plugins/digital_ocean.rb b/lib/ohai/plugins/digital_ocean.rb index e42be4f0..f637e748 100644 --- a/lib/ohai/plugins/digital_ocean.rb +++ b/lib/ohai/plugins/digital_ocean.rb @@ -19,7 +19,7 @@ require 'ohai/util/ip_helper' Ohai.plugin(:DigitalOcean) do include Ohai::Util::IpHelper - DIGITALOCEAN_FILE = '/etc/digitalocean' + DIGITALOCEAN_FILE = '/etc/digitalocean' unless defined?(DIGITALOCEAN_FILE) provides "digital_ocean" diff --git a/lib/ohai/util/ip_helper.rb b/lib/ohai/util/ip_helper.rb index 92da9956..3195dd7b 100644 --- a/lib/ohai/util/ip_helper.rb +++ b/lib/ohai/util/ip_helper.rb @@ -14,6 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +require 'ipaddress' + module Ohai module Util module IpHelper |