From 0e1f5ab91e7a613da7ec15495f05386a98626b08 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 29 Jan 2013 11:54:53 -0500
Subject: fix variable scoping

---
 puppet/modules/site_openvpn/manifests/init.pp  | 2 +-
 puppet/modules/site_shorewall/manifests/eip.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index b4c573e7..d777aa81 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("${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 067b2f83..d5d7ff19 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("${ip_address}_interface")
   }
   $ssh_config     = hiera('ssh')
   $ssh_port       = $ssh_config['port']
-- 
cgit v1.2.3