summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-17 16:54:02 +0200
committervarac <varacanero@zeromail.org>2013-10-17 16:54:02 +0200
commit1cb05456bdf659ae8869abd166fb7afc3e2345c8 (patch)
treee72e28585b694e8c09d3018314c971d1135a91c6 /puppet
parentadbecc3cacc557e5d62546cbb203fdbbe3d54e3b (diff)
parent99df31cdd58ca60b90c0098b126903e2d8251128 (diff)
Merge branch 'feature/4158_vagrant__support_other_provider' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/setup.pp4
-rw-r--r--puppet/modules/site_shorewall/manifests/defaults.pp4
2 files changed, 6 insertions, 2 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
}
diff --git a/puppet/modules/site_shorewall/manifests/defaults.pp b/puppet/modules/site_shorewall/manifests/defaults.pp
index 6a40d501..8f56ac42 100644
--- a/puppet/modules/site_shorewall/manifests/defaults.pp
+++ b/puppet/modules/site_shorewall/manifests/defaults.pp
@@ -4,7 +4,9 @@ class site_shorewall::defaults {
include site_config::params
# be safe for development
- #if ( $::virtual == 'virtualbox') { $shorewall_startup='0' }
+ # if ( $::site_config::params::environment == 'local' ) {
+ # $shorewall_startup='0'
+ # }
# If you want logging:
shorewall::params {