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 | |
| 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
| -rw-r--r-- | puppet/modules/site_config/lib/facter/ip_interface.rb | 13 | ||||
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/eip.pp | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/puppet/modules/site_config/lib/facter/ip_interface.rb b/puppet/modules/site_config/lib/facter/ip_interface.rb new file mode 100644 index 00000000..2a4a6b50 --- /dev/null +++ b/puppet/modules/site_config/lib/facter/ip_interface.rb @@ -0,0 +1,13 @@ +require 'facter/util/ip' + +Facter::Util::IP.get_interfaces.each do |interface| + ip = Facter.value("ipaddress_#{interface}") + if ip != nil + Facter.add(ip + "_interface" ) do + setcode do + interface + end + end + end +end + diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index 4606179c..a9fa8b2b 100644 --- a/puppet/modules/site_openvpn/manifests/init.pp +++ b/puppet/modules/site_openvpn/manifests/init.pp @@ -1,7 +1,7 @@ class site_openvpn { # parse hiera config $ip_address = hiera('ip_address') - $interface = hiera('interface') + $interface = getvar("$::{ip_address}_interface") #$gateway_address = hiera('gateway_address') $openvpn_config = hiera('openvpn') $openvpn_gateway_address = $openvpn_config['gateway_address'] 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') |