summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-18 12:20:43 +0200
committervarac <varacanero@zeromail.org>2013-09-18 17:22:59 +0200
commitca3f34da520ff835d383aa82f528adf927d3364f (patch)
tree7f63abd770a26ee798d2999f4b8c232a34803b65 /puppet
parent5d253f32696851771f0d95c2de1fec081657f8a4 (diff)
include shorewall::interface{eth0} in setup.pp so packages can be installed during main puppetrun, even before shorewall is configured completly
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/setup.pp8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index 84e4c056..ba58e728 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -22,3 +22,11 @@ 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 ( $::virtual == 'virtualbox' ) {
+ include site_config::vagrant
+}
+