diff options
| author | kwadronaut <kwadronaut@leap.se> | 2017-05-23 16:20:26 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2017-05-23 16:20:55 +0200 |
| commit | 0e09968d8ed3f245a238306de43a037d0749fd5a (patch) | |
| tree | 165d49dfb17d115dbb649ffe669064f2042bb527 /puppet/modules/site_config/manifests/setup.pp | |
| parent | 26be1f84de9efabf5fec1278401ae0c5538454d9 (diff) | |
| parent | 40f7b49003594a1be8c0540a92292d7cfb63eb61 (diff) | |
Merge branch 'varac/platform-vagrant_private_networking'
Diffstat (limited to 'puppet/modules/site_config/manifests/setup.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/setup.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/setup.pp b/puppet/modules/site_config/manifests/setup.pp index 82dfe76d..a96f87a6 100644 --- a/puppet/modules/site_config/manifests/setup.pp +++ b/puppet/modules/site_config/manifests/setup.pp @@ -37,7 +37,7 @@ class site_config::setup { # 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 ( $::site_config::params::environment == 'local' ) { + if $::vagrant { include site_config::vagrant } |