diff options
Diffstat (limited to 'manifests/puppetmaster.pp')
-rw-r--r-- | manifests/puppetmaster.pp | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp index dd0f800..4470a84 100644 --- a/manifests/puppetmaster.pp +++ b/manifests/puppetmaster.pp @@ -4,7 +4,8 @@ import "storeconfigs.pp" class puppet::puppetmaster inherits puppet { case $operatingsystem { - centos,debian, redhat: { include puppet::puppetmaster::package } + debian: { include puppet::puppetmaster::package } + centos: { include puppet::puppetmaster::centos } default: { case $kernel { linux: { include puppet::puppetmaster::linux } @@ -43,27 +44,6 @@ class puppet::puppetmaster inherits puppet { } } -class puppet::puppetmaster::linux inherits puppet::linux { - - service{'puppetmaster': - ensure => running, - enable => true, - require => [ Package[puppet] ], - } - - Service[puppet]{ - require +> Service[puppetmaster], - } -} - -class puppet::puppetmaster::package inherits puppet::puppetmaster::linux { - package { puppet-server: ensure => present } - - Service[puppetmaster]{ - require +> Package[puppet-server], - } -} - define puppet::puppetmaster::hasdb( $dbtype = 'mysql', $dbname = 'puppet', |