From d9a3c7617a402a19f7114d9b262d62b3a7b7b24c Mon Sep 17 00:00:00 2001
From: David Schmitt <david@schmitt.edv-bus.at>
Date: Sat, 6 Oct 2007 10:11:47 +0200
Subject: common: remove hand made plugins install defines and use matt's
 plugins patch

This moves all facts and puppet plugins to the plugins/ directory of modules to
get the benefits of Matt's plugins patch, that distributes these files before
the configuration is requested. This reduces the number of configuration runs to
convergence by one.
---
 manifests/defines/puppet_install.pp | 41 -------------------------------------
 manifests/init.pp                   | 12 -----------
 2 files changed, 53 deletions(-)
 delete mode 100644 manifests/defines/puppet_install.pp

(limited to 'manifests')

diff --git a/manifests/defines/puppet_install.pp b/manifests/defines/puppet_install.pp
deleted file mode 100644
index dbc9848..0000000
--- a/manifests/defines/puppet_install.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# puppet_install.pp -- install puppet functions and facter facts
-# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
-# See LICENSE for the full license granted to you.
-
-# prepare directories to drop various puppet enhancements
-file {
-	[
-		"${rubysitedir}",
-		"${rubysitedir}/facter",
-		"${rubysitedir}/puppet",
-		"${rubysitedir}/puppet/provider",
-		"${rubysitedir}/puppet/provider/user",
-		"${rubysitedir}/puppet/provider/group"
-	]:
-		ensure => directory,
-		mode => 0755, owner => root, group => root,
-}
-
-define puppet::function($source) {
-	file {
-		"${rubysitedir}/puppet/parser/functions/${name}.rb":
-			source => $source,
-			mode => 755, owner => root, group => root,
-	}
-}
-
-define puppet::fact($source) {
-	file {
-		"${rubysitedir}/facter/${name}.rb":
-			source => $source,
-			mode => 755, owner => root, group => root,
-	}
-}
-
-define puppet::provider($source) {
-	file {
-		"${rubysitedir}/puppet/provider/${name}.rb":
-			source => $source,
-			mode => 755, owner => root, group => root,
-	}
-}
diff --git a/manifests/init.pp b/manifests/init.pp
index bdaaee2..577b0c6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,17 +12,5 @@ file {
 		mode => 0755, owner => root, group => root;
 }
 
-class common::puppetmaster {
-	file { 
-		"${rubysitedir}/puppet/parser":
-			ensure => directory,
-			mode => 0755, owner => root, group => root;
-		"$rubysitedir/puppet/parser/functions":
-			source => "puppet://$servername/common/functions/",
-			recurse => true, purge => true,
-			mode => 0755, owner => root, group => root;
-	}
-}
-
 import "defines/*.pp"
 import "classes/*.pp"
-- 
cgit v1.2.3