a stab at auto loading conntrack modules

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/files/conntrack_ftp.conf b/modules/ferm/files/conntrack_ftp.conf
new file mode 100644 (file)
index 0000000..2b855fb
--- /dev/null
+++ b/modules/ferm/files/conntrack_ftp.conf
@@ -0,0 +1 @@
+@hook pre 'modprobe nf_conntrack_ftp || true'"

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 8ce448ec5abcf27bd1cac5bc6069dbffca2ed4e4..d58e440a3302a5faeb7e7b3f4abc933bc9ba1291 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -62,6 +62,15 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
+    case extractnodeinfo($nodeinfo, 'buildd') {
+        file {
+            "/etc/ferm/conf.d/load_ftp_conntrack.conf":
+                source => "puppet:///ferm/ferm.default",
+                require => Package["ferm"],
+                notify  => Exec["ferm restart"];
+        }
+    }
+
     case $v6ips {
         'no': {}
         default: {