aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 15:29:33 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 15:29:33 -0200
commit01572197dc119ff46f4e5704bdc8ff21bbb0f7c0 (patch)
treebd46e7f492c187ba81e5df5948d20216abf79767
parent0b2be6e6e319e7055842a2c63fe5e53abb5cae6d (diff)
downloadpuppet-nodo-01572197dc119ff46f4e5704bdc8ff21bbb0f7c0.tar.gz
puppet-nodo-01572197dc119ff46f4e5704bdc8ff21bbb0f7c0.tar.bz2
Updating puppet module
-rw-r--r--manifests/master.pp4
-rw-r--r--manifests/nodo.pp4
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': }
}
#