diff options
| author | Thom May <thom@may.lt> | 2016-03-07 17:29:23 +0000 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-03-07 17:29:23 +0000 |
| commit | 75ab6df9a1d3415fa8dfbaaa45589be535bc02d7 (patch) | |
| tree | 7bfd6437fe75ae00accd1f9c140325957dd8b1d4 | |
| parent | 84c24a16b6d401818107eeca07ff13c257205a2c (diff) | |
| parent | fc673ff578bda9f7ca06d96042155a469c298ecd (diff) | |
| download | ohai-75ab6df9a1d3415fa8dfbaaa45589be535bc02d7.tar.gz | |
Merge pull request #735 from ctso/ctso/fix-digital-ocean
Fix digital ocean ip address detection
| -rw-r--r-- | lib/ohai/plugins/digital_ocean.rb | 2 | ||||
| -rw-r--r-- | spec/unit/plugins/digital_ocean_spec.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/ohai/plugins/digital_ocean.rb b/lib/ohai/plugins/digital_ocean.rb index a9414c41..a72127b6 100644 --- a/lib/ohai/plugins/digital_ocean.rb +++ b/lib/ohai/plugins/digital_ocean.rb @@ -28,7 +28,7 @@ Ohai.plugin(:DigitalOcean) do addresses = Mash.new({ "v4" => [], "v6" => [] }) network[:interfaces].each_value do |iface| iface[:addresses].each do |address, details| - next if loopback?(address) || details[:family] == "lladdr" + next if details[:family] == "lladdr" || loopback?(address) ip = IPAddress(address) type = digital_ocean_address_type(ip) diff --git a/spec/unit/plugins/digital_ocean_spec.rb b/spec/unit/plugins/digital_ocean_spec.rb index 09b1f8c4..a4fb8baa 100644 --- a/spec/unit/plugins/digital_ocean_spec.rb +++ b/spec/unit/plugins/digital_ocean_spec.rb @@ -42,6 +42,9 @@ describe Ohai::System, "plugin digital_ocean" do "interfaces" => { "eth0" => { "addresses" => { + "00:D3:AD:B3:3F:00" => { + "family" => "lladdr" + }, "1.2.3.4" => { "netmask" => "255.255.255.0" }, |