From 01572197dc119ff46f4e5704bdc8ff21bbb0f7c0 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 25 Jan 2013 15:29:33 -0200 Subject: Updating puppet module --- manifests/master.pp | 4 ++-- manifests/nodo.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/master.pp b/manifests/master.pp index 73fa8df..3b02195 100644 --- 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 ba27640..50725a7 100644 --- 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': } } # -- cgit v1.2.3