summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
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
+}
+