From ecb3727ad43ee55f07db067e80b9d74308296582 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 17 Sep 2013 18:00:32 +0200
Subject: site_config::params::interface should contain eth1 for vagrant cause
 it's the main interface we use (#2399, #2401)

---
 puppet/modules/site_config/manifests/params.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp
index 20697042..a4657457 100644
--- a/puppet/modules/site_config/manifests/params.pp
+++ b/puppet/modules/site_config/manifests/params.pp
@@ -5,7 +5,7 @@ class site_config::params {
   $ec2_local_ipv4_interface = getvar("interface_${::ec2_local_ipv4}")
 
   if $::virtual == 'virtualbox' {
-    $interface = [ 'eth0', 'eth1' ]
+    $interface = 'eth1'
   }
   elsif hiera('interface','') != '' {
     $interface = hiera('interface')
@@ -17,7 +17,7 @@ class site_config::params {
     $interface = $ec2_local_ipv4_interface
   }
   elsif $::interfaces =~ /eth0/ {
-    $interface = eth0
+    $interface = 'eth0'
   }
   else {
     fail("unable to determine a valid interface, please set a valid interface for this node in nodes/${::hostname}.json")
-- 
cgit v1.2.3


From 5ca8f6f9d26a2c2abfa9f1752aad6b8d91020074 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 17 Sep 2013 18:37:00 +0200
Subject: shorewall: #2399 blocks uplink (Bug #2866)

---
 puppet/modules/site_config/manifests/default.pp |  7 +++++++
 puppet/modules/site_config/manifests/vagrant.pp | 10 ++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 puppet/modules/site_config/manifests/vagrant.pp

diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index b315044a..83a344a2 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -15,11 +15,18 @@ class site_config::default {
   # configure ssh and include ssh-keys
   include site_config::sshd
 
+  # include classes for special environments
+  # i.e. openstack/aws nodes, vagrant nodes
+
   # fix dhclient from changing resolver information
   if $::ec2_instance_id {
     include site_config::dhclient
   }
 
+  if ( $::virtual == 'virtualbox' ) {
+    include site_config::vagrant
+  }
+
   # configure /etc/resolv.conf
   include site_config::resolvconf
 
diff --git a/puppet/modules/site_config/manifests/vagrant.pp b/puppet/modules/site_config/manifests/vagrant.pp
new file mode 100644
index 00000000..04266735
--- /dev/null
+++ b/puppet/modules/site_config/manifests/vagrant.pp
@@ -0,0 +1,10 @@
+class site_config::vagrant {
+  # class for vagrant nodes
+
+  # eth0 on vagrant nodes is the uplink if
+  shorewall::interface { 'eth0':
+    zone      => 'net',
+    options   => 'tcpflags,blacklist,nosmurfs';
+  }
+
+}
-- 
cgit v1.2.3