1 files changed, 14 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index adbaebc..5baee4d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,29 +3,34 @@
 #
 
 class nodo(
-  $role     = 'default',
-  $location = 'default',
+  $role = $::role,
 ) {
   # Default execution path
   Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" }
 
   # Fileserver backup
-  filebucket { server: server => hiera('puppet::daemon::server', "puppet.${::domain}") }
+  filebucket { server: server => lookup('puppet::daemon::server', undef, undef, "puppet.${::domain}") }
   File { backup => server }
 
   # Include base class
   include nodo::base
 
+  $nodo_role = $role ? {
+    ''      => 'default',
+    default => $role,
+  }
+
   # Include role class
-  if defined("nodo::role::${role}") {
-    class { "nodo::role::${role}": }
+  if defined("nodo::role::${nodo_role}") {
+    class { "nodo::role::${nodo_role}": }
   }
 
   # Include additional classes
-  $classes = hiera('classes', false)
-  if $classes != false {
-    hiera_include('classes')
-  }
+  #$classes = lookup('classes', undef, undef, false)
+  #if $classes != false {
+  #  hiera_include('classes')
+  #}
+  lookup('classes', { merge => unique }).include
 
   # Declare resources
   class { "nodo::resources": }