The trick for merge options to work is to use lookup() rather than hiera()

[mirror/dsa-puppet.git] / modules / resolv / manifests / init.pp

diff --git a/modules/resolv/manifests/init.pp b/modules/resolv/manifests/init.pp
index 669fe4c..c2a741d 100644 (file)
--- a/modules/resolv/manifests/init.pp
+++ b/modules/resolv/manifests/init.pp
@@ -2,11 +2,11 @@ class resolv {
 
        $nameservers = $facts['unbound'] ? {
                true    => ['127.0.0.1'],
-               default => hiera('nameservers'),
+               default => lookup('nameservers'),
        }
 
-       $searchpaths = hiera('searchpaths')
-       $resolvoptions = hiera('resolvoptions')
+       $searchpaths = lookup('resolv_conf::searchpaths')
+       $resolvoptions = lookup('resolv_conf::resolvoptions')
 
        file { '/etc/resolv.conf':
                        content => template('resolv/resolv.conf.erb');