diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-05 18:20:55 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-05 18:20:55 +0000 |
| commit | f4200deb3fbb72e2c234ffb1a591b77dc7265a06 (patch) | |
| tree | d1db73f708b3603f4b2bd14723b9893f9cf72aba | |
| parent | 071e4b4544f9936ac09f644921733c35f9903810 (diff) | |
| download | puppet-f4200deb3fbb72e2c234ffb1a591b77dc7265a06.tar puppet-f4200deb3fbb72e2c234ffb1a591b77dc7265a06.tar.gz puppet-f4200deb3fbb72e2c234ffb1a591b77dc7265a06.tar.bz2 puppet-f4200deb3fbb72e2c234ffb1a591b77dc7265a06.tar.xz puppet-f4200deb3fbb72e2c234ffb1a591b77dc7265a06.zip | |
- deploy puppet on puppet nodes
| -rw-r--r-- | manifests/common.pp | 3 | ||||
| -rw-r--r-- | manifests/nodes.pp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/manifests/common.pp b/manifests/common.pp index 83b7cede..da68c4cb 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -82,13 +82,12 @@ class urpmi_update { 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 } diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 9f68fbd8..2528b668 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -18,7 +18,7 @@ node valstar { 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 @@ node valstar { recurse => true } - package {"puppet-server": - ensure => "installed" - } - package {"task-bs-cluster-main": ensure => "installed" } |