diff options
| author | varac <varacanero@zeromail.org> | 2015-04-13 23:16:00 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-01-22 09:50:33 +0100 |
| commit | 150579fb14716892cc3e4d7d9c0f81b30d56f03a (patch) | |
| tree | 1cec18fffe6d70edd64696802cba264693f38ff5 /puppet/modules/site_config | |
| parent | d87a8787908fb1c82901d9611a971c9bed0a3907 (diff) | |
restructured site.pp, now only one class gets included in site.pp per service (Bug #6851)
Also, moved global Exec{} defaults to site.pp
Change-Id: I9ae91b77afde944d2f1312613b9d9030e32239dd
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 6b10dc19..4e297026 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -2,17 +2,15 @@ class site_config::default { tag 'leap_base' - # the logoutput exec parameter defaults to "on_error" in puppet 3, - # but to "false" in puppet 2.7, so we need to set this globally here - Exec<||> { logoutput => on_failure } - $services = hiera('services', []) $domain_hash = hiera('domain') include site_config::params + include site_config::setup # make sure apt is updated before any packages are installed include apt::update Package { require => Exec['apt_updated'] } + include site_config::packages::uninstall include site_config::slow |