diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-27 20:23:52 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-29 13:29:10 -0500 |
| commit | 6ebc2b495d9ea920770823cd08ae4eb881b684f7 (patch) | |
| tree | 84ebc5efb2c89f4e3d71f6bdf8e363140ec59768 /puppet/modules/site_shorewall | |
| parent | 64a3ec6ac5a064800a32170c2e8d058ab8b7dd62 (diff) | |
add a new fact that provides a fact for each configured ip address, telling you
which interface has it (essentially the inverse of the ipaddress_${interface}
fact).
Switch the hiera lookups of the $interface, which was pulling from the .json to
pull instead from the above fact, see #1547 and #1548
Diffstat (limited to 'puppet/modules/site_shorewall')
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/eip.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_shorewall/manifests/eip.pp b/puppet/modules/site_shorewall/manifests/eip.pp index 7de1510c..35912dfe 100644 --- a/puppet/modules/site_shorewall/manifests/eip.pp +++ b/puppet/modules/site_shorewall/manifests/eip.pp @@ -5,7 +5,8 @@ class site_shorewall::eip { include site_shorewall::defaults - $interface = hiera('interface') + $ip_address = hiera('ip_address') + $interface = getvar("$::{ip_address}_interface") $ssh_config = hiera('ssh') $ssh_port = $ssh_config['port'] $openvpn_config = hiera('openvpn') |