Make nodo class include the role class

diff --git a/manifests/host.pp b/manifests/host.pp
index eb907bbbccefeffcee09b75ceb9dee106c7271bb..ee87e2f19eda5ecae45e56dbaea00cc37a627832 100644 (file)
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -1,5 +1,5 @@
 # Fully capable node able to host other nodes
-class nodo::host inherits nodo {
+class nodo::host {
   include nodo::subsystem::initramfs
   include nodo::subsystem::modprobe
   include nodo::subsystem::firewire

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 27d97fab91cd1bee08a6460ba691c3904f1cb4d5..b70bc6590657678a0e96566236fa167c14e4d122 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -1,4 +1,7 @@
-class nodo {
+class nodo(
+  $role,
+  $location = 'default'
+) {
   include lsb
   include nodo::subsystem::sudo
   include nodo::subsystem::motd
@@ -149,4 +152,9 @@ class nodo {
     mode    => 0755,
     ensure  => present,
   }
+
+  # Include role class
+  if defined("nodo::role::$role") {
+    class { "nodo::role::$role": }
+  }
 }

diff --git a/manifests/plug.pp b/manifests/plug.pp
index f9e787b1f1e1e703f54ee8f8fa883008207cfd8a..858ba0a2edd0dbc24888a3cc53f59022ef580d58 100644 (file)
--- a/manifests/plug.pp
+++ b/manifests/plug.pp
@@ -1,4 +1,4 @@
-class nodo::plug inherits nodo {
+class nodo::plug {
   include syslog-ng
   include nodo::utils::plug
   include nodo::utils::physical

diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index 2faa69b8d30cb06bc0d032509604182dc9a83f2c..a4390924d0d1d09a28253c07b9fa5cb565c7804f 100644 (file)
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -1,3 +1,7 @@
 class nodo::role::dns inherits nodo::vserver {
   include bind
+
+  if defined('dns') {
+    class { 'dns': }
+  }
 }

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index fa081472ab671c99b663bdce1e74bc620dc3a68f..030803f90c58a29403c7998e6377adf8660526c3 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -1,4 +1,4 @@
-class nodo::vserver inherits nodo {
+class nodo::vserver {
   class { 'timezone': }
   class { 'syslog-ng::vserver': }