diff options
| author | elijah <elijah@riseup.net> | 2017-09-05 18:24:31 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2017-09-05 18:24:31 -0700 |
| commit | 6482a4ccb3d72773cc6d00d5fa7933fa83c4cafe (patch) | |
| tree | 7889f849a75e02d971919f154eb1746ce7e686a3 /puppet/modules/site_config/manifests | |
| parent | 437f28b2cbfedfc7d119dcf4e228c5626bb8a152 (diff) | |
Bug: fix vpn network problem caused by vagrant fact
Boolean facts must be escaped with str2bool. This commit includes
new tests to catch VPN problems like this in the future.
Diffstat (limited to 'puppet/modules/site_config/manifests')
| -rw-r--r-- | puppet/modules/site_config/manifests/params.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/setup.pp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp index 4627515a..2c9687a3 100644 --- a/puppet/modules/site_config/manifests/params.pp +++ b/puppet/modules/site_config/manifests/params.pp @@ -6,8 +6,7 @@ class site_config::params { $ec2_local_ipv4_interface = getvar("interface_${::ec2_local_ipv4}") $environment = hiera('environment', undef) - - if $::vagrant { + if str2bool("$::vagrant") { # Depending on the backend hypervisor networking is setup differently. if $::interfaces =~ /eth1/ { # Virtualbox: Private networking creates a second interface eth1 diff --git a/puppet/modules/site_config/manifests/setup.pp b/puppet/modules/site_config/manifests/setup.pp index a96f87a6..bd3097fa 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 $::vagrant { + if str2bool("$::vagrant") { include site_config::vagrant } |