aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp5
-rw-r--r--manifests/nodo.pp5
2 files changed, 6 insertions, 4 deletions
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