summaryrefslogtreecommitdiff
path: root/puppet/manifests/setup.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-16 21:30:16 +0200
committervarac <varacanero@zeromail.org>2013-10-16 21:30:16 +0200
commit99df31cdd58ca60b90c0098b126903e2d8251128 (patch)
treec60496d353ab86ec8bcf25e9071c22b0692571cf /puppet/manifests/setup.pp
parent27f6e30c0096970c49efcf572227d39fe5612ed9 (diff)
vagrant: support other providers besides virtualbox (Bug #4158), Part 2
took out the last remaining virtualbox references
Diffstat (limited to 'puppet/manifests/setup.pp')
-rw-r--r--puppet/manifests/setup.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index ba58e728..84124f5a 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -5,6 +5,8 @@ $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
@@ -26,7 +28,7 @@ if hiera('squid_deb_proxy_client', false) {
# 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' ) {
+if ( $::site_config::params::environment == 'local' ) {
include site_config::vagrant
}