Modified: puppet/manifests/common.pp
===================================================================
--- puppet/manifests/common.pp 2010-11-05 18:20:22 UTC (rev 154)
+++ puppet/manifests/common.pp 2010-11-05 18:20:55 UTC (rev 155)
@@ -82,13 +82,12 @@
class default_mageia_server {
include timezone
-# to include later
include openssh
-# include puppet
include default_ssh_root_key
include base_packages
include ntp
include postfix::simple_relay
include urpmi_update
+ include puppet::client
}
Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp 2010-11-05 18:20:22 UTC (rev 154)
+++ puppet/manifests/nodes.pp 2010-11-05 18:20:55 UTC (rev 155)
@@ -18,7 +18,7 @@
include openldap::master
include subversion::client
include subversion::server
-
+ include puppet::master
subversion::snapshot { "/etc/puppet":
source => "svn://svn.mageia.org/adm/puppet/"
@@ -33,10 +33,6 @@
recurse => true
}
- package {"puppet-server":
- ensure => "installed"
- }
-
package {"task-bs-cluster-main":
ensure => "installed"
}