Updating puppet module

diff --git a/manifests/master.pp b/manifests/master.pp
index 73fa8dfa41a7bb2cabbb1e0f110b7f885920a365..3b021959f6050958a892272d7baacef58aa9f174 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -3,7 +3,7 @@ class nodo::master {
 
   if $main_master == true {
     # Puppetmaster should be included before nodo::vserver
-    class { 'puppetmasterd':
+    class { 'puppet::master':
       main => true,
     }
 
@@ -18,7 +18,7 @@ class nodo::master {
       alias  => ["puppet.$domain"],
     }
   } else {
-    class { 'puppetmasterd':
+    class { 'puppet::master':
       main => false,
     }
 

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index ba27640b462ce2a340dbe02fcda018ee2a361e63..50725a7def97955a5fa1cc653a9de0592ba1a272 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -13,8 +13,8 @@ class nodo {
 
   class { 'hosts': }
 
-  if !defined('puppetd') {
-    class { 'puppetd': }
+  if !defined('puppet::daemon') {
+    class { 'puppetd::daemon': }
   }
 
   #