From 1457c4a85ad3e7f2fbdc6f969b801542b3396581 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Mar 2014 23:42:19 +0100
Subject: Move setup.pp to a subclass (site_config::setup) (Feature #2993)

---
 puppet/manifests/setup.pp | 36 +-----------------------------------
 puppet/manifests/site.pp  |  1 +
 2 files changed, 2 insertions(+), 35 deletions(-)

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index f89b7032..4dd03203 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -1,39 +1,5 @@
 #
 # this is applied before each run of site.pp
 #
-$services = ''
 
-Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
-
-include site_config::params
-
-include concat::setup
-
-include site_config::hosts
-
-include site_config::initial_firewall
-
-include site_apt
-
-package { 'facter':
-  ensure  => latest,
-  require => Exec['refresh_apt']
-}
-
-if hiera('squid_deb_proxy_client', false) {
-  include site_squid_deb_proxy::client
-}
-
-# shorewall is installed/half-configured during setup.pp (Bug #3871)
-# we need to include shorewall::interface{eth0} in setup.pp so
-# packages can be installed during main puppetrun, even before shorewall
-# is configured completly
-if ( $::site_config::params::environment == 'local' ) {
-  include site_config::vagrant
-}
-
-# if class site_custom::setup exists, include it.
-# possibility for users to define custom puppet recipes
-if defined( '::site_custom::setup') {
-  include ::site_custom::setup
-}
+include ::site_config::setup
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index def0a642..d83a189d 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -5,6 +5,7 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
 $services=join(hiera_array('services', ['']), ' ')
 notice("Services for ${fqdn}: ${services}")
 
+include site_config::setup
 include site_config::default
 
 # configure eip
-- 
cgit v1.2.3