From 658c9e74a45a8e1c833a6e4d524b862888bd5bef Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 24 May 2013 10:41:30 +0300
Subject: [PATCH] More instance variable cleanup

---
 ldap/templates/login.conf.erb | 2 +-
 network/manifests/init.pp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ldap/templates/login.conf.erb b/ldap/templates/login.conf.erb
index 73f9d19..3544fe2 100644
--- a/ldap/templates/login.conf.erb
+++ b/ldap/templates/login.conf.erb
@@ -100,7 +100,7 @@ require 'uri'
 
 n = 0
 servers = ""
-ldap_server.each do |uri|
+@ldap_server.each do |uri|
     uri = URI.parse(uri)
     if uri.scheme == "ldaps":
         mode = "ssl"
diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index d4af18f..19026e4 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -170,7 +170,7 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none",
     case $eaddr {
         none: {
             $myvar = "macaddress_${name}"
-            $eaddr_real = inline_template("<%= scope.lookupvar(myvar) %>")
+            $eaddr_real = inline_template("<%= scope.lookupvar(@myvar) %>")
         }
         default: {
             $eaddr_real = $eaddr