From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 06:56:31 +0000 (+0200)
Subject: Do tcp bbr and fq scheduling not only on busy hosts but all of them
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=44543353360a5d4446ed72861e0604cc218d73e5;p=mirror%2Fdsa-puppet.git

Do tcp bbr and fq scheduling not only on busy hosts but all of them
---

diff --git a/modules/tcp_bbr/manifests/init.pp b/modules/tcp_bbr/manifests/init.pp
index 22ee67628..4dbcf5537 100644
--- a/modules/tcp_bbr/manifests/init.pp
+++ b/modules/tcp_bbr/manifests/init.pp
@@ -1,47 +1,13 @@
 class tcp_bbr {
-	# this is included by all hosts,
-	# so filtering needs to happen here.
+  base::linux_module { 'tcp_bbr': }
+  base::linux_module { 'sch_fq': }
 
-	if versioncmp($::lsbmajdistrelease, '9') >= 0 {
-		if
-		   has_role('api.ftp-master') or
-		   has_role('bacula_storage') or
-		   has_role('bugs_master') or
-		   has_role('bugs_mirror') or
-		   has_role('debian_mirror') or
-		   has_role('debug_mirror') or
-		   has_role('dgit_git') or
-		   has_role('ftp.upload.d.o') or
-		   has_role('ftp_master') or
-		   has_role('git_master') or
-		   has_role('historical_master') or
-		   has_role('historical_mirror') or
-		   has_role('ports_master') or
-		   has_role('ports_mirror') or
-		   has_role('postgres_backup_server') or
-		   has_role('postgresql_server') or
-		   has_role('security_master') or
-		   has_role('security_mirror') or
-		   has_role('security_upload') or
-		   has_role('ssh.upload.d.o') or
-		   defined(Class["staticync::static_master"]) or
-		   defined(Class["staticync::static_mirror"]) or
-		   defined(Class["staticync::static_source"]) or
-		   has_role('syncproxy') or
-		   has_role('www_master') or
-		   false {
-
-			base::linux_module { 'tcp_bbr': }
-			base::linux_module { 'sch_fq': }
-
-			base::sysctl { 'puppet-net_core_default_qdisc':
-				key   => 'net.core.default_qdisc',
-				value => 'fq',
-			}
-			base::sysctl { 'puppet-net_ipv4_tcp_congestion_control':
-				key   => 'net.ipv4.tcp_congestion_control',
-				value => 'bbr',
-			}
-		}
-	}
+  base::sysctl { 'puppet-net_core_default_qdisc':
+    key   => 'net.core.default_qdisc',
+    value => 'fq',
+  }
+  base::sysctl { 'puppet-net_ipv4_tcp_congestion_control':
+    key   => 'net.ipv4.tcp_congestion_control',
+    value => 'bbr',
+  }
 }