From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Jul 2018 10:04:42 +0000 (+0100)
Subject: Add support for monitoring hosts behind NAT
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/89634c26de56cac77a87cfed1b36770e7f144c59?ds=sidebyside

Add support for monitoring hosts behind NAT
---

diff --git a/cookbooks/networking/libraries/ipaddresses.rb b/cookbooks/networking/libraries/ipaddresses.rb
index 51ef152b5..d31d885f9 100644
--- a/cookbooks/networking/libraries/ipaddresses.rb
+++ b/cookbooks/networking/libraries/ipaddresses.rb
@@ -4,10 +4,12 @@ class Chef
       addresses = []
 
       interfaces(options).each do |interface|
+        address = interface[:public_address] || interface[:address]
+
         if block.nil?
-          addresses << interface[:address]
+          addresses << address
         else
-          yield interface[:address]
+          yield address
         end
       end
 
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 12ccf15eb..b29de0fa1 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -32,7 +32,8 @@ default_attributes(
         :family => :inet,
         :address => "10.5.0.77",
         :prefix => "16",
-        :gateway => "10.5.0.1"
+        :gateway => "10.5.0.1",
+        :public_address => "161.53.248.77"
       }
     },
     :nameservers => [