From e55f3c60b30042a72d722f21b0c6133faaa78a43 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 13 Apr 2013 16:21:15 -0300
Subject: Get role and location variables via hiera

---
 manifests/init.pp | 5 +++++
 manifests/nodo.pp | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index df1c239..d8155b6 100644
--- 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 b70bc65..bd3f2a4 100644
--- 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
-- 
cgit v1.2.3