diff options
author | Michael Scherer <misc@mageia.org> | 2010-11-05 18:20:57 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2010-11-05 18:20:57 +0000 |
commit | ef270a961d081eb3bed0eb68b545f99ab87f3a12 (patch) | |
tree | 494d2ffd4827c556a97d82542cfaedba3cca8c8a | |
parent | f4200deb3fbb72e2c234ffb1a591b77dc7265a06 (diff) | |
download | puppet-ef270a961d081eb3bed0eb68b545f99ab87f3a12.tar puppet-ef270a961d081eb3bed0eb68b545f99ab87f3a12.tar.gz puppet-ef270a961d081eb3bed0eb68b545f99ab87f3a12.tar.bz2 puppet-ef270a961d081eb3bed0eb68b545f99ab87f3a12.tar.xz puppet-ef270a961d081eb3bed0eb68b545f99ab87f3a12.zip |
move extdata to the module
-rw-r--r-- | manifests/nodes.pp | 10 | ||||
-rw-r--r-- | modules/puppet/manifests/init.pp | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 2528b668..ea79341e 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -23,16 +23,6 @@ node valstar { subversion::snapshot { "/etc/puppet": source => "svn://svn.mageia.org/adm/puppet/" } - - file { "extdata": - path => "/etc/puppet/extdata", - ensure => directory, - owner => puppet, - group => puppet, - mode => 700, - recurse => true - } - package {"task-bs-cluster-main": ensure => "installed" } diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index 2451a10c..92f569b3 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -30,5 +30,14 @@ class puppet { path => "/etc/init.d/puppetmaster", subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] } + + file { "extdata": + path => "/etc/puppet/extdata", + ensure => directory, + owner => puppet, + group => puppet, + mode => 700, + recurse => true + } } } |