summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-20 19:08:40 +0200
committervarac <varacanero@zeromail.org>2013-09-20 19:08:40 +0200
commit3d4960e59c1c742fc0706b37a40e03b698865587 (patch)
tree681ed94dcfc806d530c08dd732c6631cfeb7d85e /puppet
parent0bf2c2eeaf5f8b683454ce0d0dbe88bb6f17c08f (diff)
parent98d8a337930d5afaf78d88c23adb985a7060f66b (diff)
Merge branch 'feature/3782_Discuss_run_stages_on_deploy' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/site.pp8
-rw-r--r--puppet/modules/site_config/manifests/default.pp9
2 files changed, 9 insertions, 8 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index bce3a08b..9f5d82d8 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -5,15 +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}")
-# make sure apt is updated before any packages are installed
-include apt::update
-Package { require => Exec['apt_updated'] }
-
-include stdlib
-
include site_config::default
-include site_config::slow
-
# configure eip
if $services =~ /\bopenvpn\b/ {
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index b27e99af..16932ab2 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -3,6 +3,15 @@ class site_config::default {
$domain_hash = hiera('domain')
+ # make sure apt is updated before any packages are installed
+ include apt::update
+ Package { require => Exec['apt_updated'] }
+
+ include stdlib
+
+ include site_config::slow
+
+
include concat::setup
# default class, used by all hosts