Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/306633

Change subject: Add modprobe configuration for br_netfilter for Linux >= 3.18
......................................................................

Add modprobe configuration for br_netfilter for Linux >= 3.18

Starting with 3.18 (34666d467cbf1e2e3c7bb15a63eccfb582cdd71f) the
netfilter code was split from the bridge kernel module into a
separate module (br_netfilter).

Ideally, the nova upstart job/systemd unit would deal with that,
but let's load it in puppet for now.

Bug: T142388
Change-Id: I9d66a39d62caa6c80a74894da9c633e57197edd9
---
M modules/role/manifests/labs/openstack/nova.pp
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/306633/1

diff --git a/modules/role/manifests/labs/openstack/nova.pp 
b/modules/role/manifests/labs/openstack/nova.pp
index e539dae..f8a9e60 100644
--- a/modules/role/manifests/labs/openstack/nova.pp
+++ b/modules/role/manifests/labs/openstack/nova.pp
@@ -384,5 +384,17 @@
         }
     }
 
+    # Starting with 3.18 (34666d467cbf1e2e3c7bb15a63eccfb582cdd71f) the 
netfilter code
+    # was split from the bridge kernel module into a separate module 
(br_netfilter)
+    if (versioncmp($::kernelversion, '3.18') >= 0) {
+        file { '/etc/modprobe.d/br_netfilter.conf':
+            ensure  => present,
+            owner   => 'root',
+            group   => 'root',
+            mode    => '0444',
+            content => 'options br_netfilter',
+        }
+    }
+
     require_package('conntrack')
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/306633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d66a39d62caa6c80a74894da9c633e57197edd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to