diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-29 13:20:05 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-29 13:29:10 -0500 |
| commit | a3edca1924353a797fffd8fb8506d8be86d930d3 (patch) | |
| tree | ccc5c39521d89503bc5ca2efc98d2f88ccea39e7 | |
| parent | e83842af0eff8e7754f79100c786f0dc235eba75 (diff) | |
fix variable name for re-ordered fact
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/eip.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index d777aa81..0ddb01ae 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 = getvar("${ip_address}_interface") + $interface = getvar("interface_${ip_address}") #$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 b2d165db..09dfece6 100644 --- a/puppet/modules/site_shorewall/manifests/eip.pp +++ b/puppet/modules/site_shorewall/manifests/eip.pp @@ -9,7 +9,7 @@ class site_shorewall::eip { # a special case for vagrant interfaces $interface = $::virtual ? { virtualbox => [ 'eth0', 'eth1' ], - default => getvar("${ip_address}_interface") + default => getvar("interface_${ip_address}") } $ssh_config = hiera('ssh') $ssh_port = $ssh_config['port'] |