Get role and location variables via hiera

diff --git a/manifests/init.pp b/manifests/init.pp
index df1c239b5e23c349df2a284706ffc5e601c92da9..d8155b6fb16ae017b98ea2d6c52d9fcc0d5f9a27 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -9,6 +9,11 @@ Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" }
 filebucket { server: server => hiera('puppet::daemon::server', "puppet.${::domain}") }
 File { backup => server }
 
+# Set role and location variables: this is a trick so we can use role and location
+# in Hiera's hierarchical config.
+$role     = hiera('nodo::role', 'default')
+$location = hiera('nodo::role', 'default')
+
 # Import required modules
 import "common"
 import "sshd"

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index b70bc6590657678a0e96566236fa167c14e4d122..bd3f2a4137dc696b555d5d198bfdd50346fdd888 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -1,7 +1,4 @@
-class nodo(
-  $role,
-  $location = 'default'
-) {
+class nodo {
   include lsb
   include nodo::subsystem::sudo
   include nodo::subsystem::motd