Hiera 5 migration

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index cdb863953047d833010b5ec621451a48a63a6b69..40ca0b865603945d10a5c5246422b9aaa5d75410 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,7 +1,7 @@
 class git::daemon (
-  $implementation = hiera('git::daemon::implementation', 'gitolite'),
-  $inetd          = hiera('git::daemon::inetd',          true),
-  $groups         = hiera('git::daemon::groups',         [ 'puppet' ]),
+  $implementation = lookup('git::daemon::implementation', undef, undef, 'gitolite'),
+  $inetd          = lookup('git::daemon::inetd', undef, undef,          true),
+  $groups         = lookup('git::daemon::groups', undef, undef,         [ 'puppet' ]),
 ) {
   # directory for git user and repositories
   file { "/var/git":

diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp
index d546349a289b8be8ab8475f41064b781185fe730..1d670bec4de0e8137c56b9f3b03d93fb0e2e9aa7 100644 (file)
--- a/manifests/gitweb.pp
+++ b/manifests/gitweb.pp
@@ -1,9 +1,9 @@
 # This class handles a gitweb installation.
 
 class git::gitweb(
-  $protocol       = hiera('git::web::protocol',          'git'),
-  $hosting_domain = hiera('apache::site::domain',        $::domain),
-  $implementation = hiera('git::daemon::implementation', 'gitolite')
+  $protocol       = lookup('git::web::protocol', undef, undef,          'git'),
+  $hosting_domain = lookup('apache::site::domain', undef, undef,        $::domain),
+  $implementation = lookup('git::daemon::implementation', undef, undef, 'gitolite')
 ) {
 
   # the needed packages