diff options
author | Micah Anderson <micah@riseup.net> | 2013-01-27 20:47:01 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-01-29 13:29:10 -0500 |
commit | 7480df63974459e733a6733994adc19ac464be6a (patch) | |
tree | 3e5ea9facedbf86fa2abd49eb00881d79750cec9 | |
parent | bdf7beb1594b480bd438625b33f27403d2ab5959 (diff) |
create a special case for vagrant machines that need to have both interfaces in
the net zone so we dont lock ourselves out during deploy, but also are able to
access the internet
-rw-r--r-- | puppet/modules/site_shorewall/manifests/eip.pp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/site_shorewall/manifests/eip.pp b/puppet/modules/site_shorewall/manifests/eip.pp index a3f6ee54..067b2f83 100644 --- a/puppet/modules/site_shorewall/manifests/eip.pp +++ b/puppet/modules/site_shorewall/manifests/eip.pp @@ -6,7 +6,11 @@ class site_shorewall::eip { include site_shorewall::defaults $ip_address = hiera('ip_address') - $interface = getvar("$::{ip_address}_interface") + # a special case for vagrant interfaces + $interface = $::virtual ? { + virtualbox => ['eth0', 'eth1'], + default => getvar("$::{ip_address}_interface") + } $ssh_config = hiera('ssh') $ssh_port = $ssh_config['port'] $openvpn_config = hiera('openvpn') |