From 99df31cdd58ca60b90c0098b126903e2d8251128 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 16 Oct 2013 21:30:16 +0200
Subject: vagrant: support other providers besides virtualbox (Bug #4158), Part
 2

took out the last remaining virtualbox references
---
 puppet/manifests/setup.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'puppet/manifests')

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
 }
 
-- 
cgit v1.2.3