Hiera 5 migration

diff --git a/manifests/resources.pp b/manifests/resources.pp
index 44ef67cf8c725e52855967dd486539e03699c6f7..498d498f95360dd8c0ba3b2a4f010bf2f29e3627 100644 (file)
--- a/manifests/resources.pp
+++ b/manifests/resources.pp
@@ -1,12 +1,12 @@
 class websites::resources {
   # Retrieve configured instances
-  $sites            = hiera('apache::sites',           {})
-  $modules          = hiera('apache::modules',         {})
-  $configs          = hiera('apache::configs',         {})
-  $databases        = hiera('database::instances',     {})
-  $database_configs = hiera('database::configs',       {})
-  $ikiwikis         = hiera('ikiwiki::instances',      {})
-  $domains          = hiera('domain_check::instances', {})
+  $sites            = lookup('apache::sites', undef, undef,           {})
+  $modules          = lookup('apache::modules', undef, undef,         {})
+  $configs          = lookup('apache::configs', undef, undef,         {})
+  $databases        = lookup('database::instances', undef, undef,     {})
+  $database_configs = lookup('database::configs', undef, undef,       {})
+  $ikiwikis         = lookup('ikiwiki::instances', undef, undef,      {})
+  $domains          = lookup('domain_check::instances', undef, undef, {})
 
   # Apply instances
   create_resources('apache::site',           $sites)

diff --git a/manifests/setup.pp b/manifests/setup.pp
index e9ac1d78b161afdf2796b0bb8f13f9061dc86cf5..57866cf48a597b4558f0beb2e62901e31077e3b4 100644 (file)
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -1,6 +1,6 @@
 class websites::setup {
   # Third-party hosted nodes generally aren't behind an https proxy
-  $hosting_type = hiera('nodo::vserver::hosting_type', 'direct')
+  $hosting_type = lookup('nodo::vserver::hosting_type', undef, undef, 'direct')
 
   # Include apache
   class { 'apache':