From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 17:04:39 +0000 (+0200)
Subject: Try to retire the site module: move linux_module to base
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=81b0a1f89e864acc9d8fc8bb7a13b186d58f8ebc;p=mirror%2Fdsa-puppet.git

Try to retire the site module: move linux_module to base
---

diff --git a/modules/autofs/manifests/common.pp b/modules/autofs/manifests/common.pp
index 0a1fac390..fc0bc6f89 100644
--- a/modules/autofs/manifests/common.pp
+++ b/modules/autofs/manifests/common.pp
@@ -2,9 +2,9 @@ class autofs::common {
 	package { 'autofs': ensure => installed }
 	package { 'nfs-common': ensure => installed }
 
-	site::linux_module { 'nfs': }
-	site::linux_module { 'nfsv4': }
-	site::linux_module { 'autofs4': }
+	base::linux_module { 'nfs': }
+	base::linux_module { 'nfsv4': }
+	base::linux_module { 'autofs4': }
 
 	exec { 'autofs reload':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
diff --git a/modules/base/manifests/linux_module.pp b/modules/base/manifests/linux_module.pp
new file mode 100644
index 000000000..acd287fe6
--- /dev/null
+++ b/modules/base/manifests/linux_module.pp
@@ -0,0 +1,19 @@
+define base::linux_module ($ensure = present) {
+	if $::kernel == linux {
+		case $ensure {
+			present: {
+				exec { "append_module_${name}":
+					command => "echo '${name}' >> /etc/modules",
+					unless => "grep -q -F -x '${name}' /etc/modules",
+				}
+			}
+			absent: {
+				exec { "remove_module_${name}":
+					command => "sed -i -e'/^${name}\$/d' /etc/modules",
+					onlyif => "grep -q -F -x '${name}' /etc/modules",
+				}
+			}
+			default: { fail ("invalid ensure value ${ensure}") }
+		}
+	}
+}
diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 1708ba857..f86e580bb 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -17,7 +17,7 @@ class ganeti2 {
 		ensure => installed
 	}
 
-	site::linux_module { 'tun': }
+	base::linux_module { 'tun': }
 
 	file { '/etc/cron.hourly/puppet-cleanup-watcher-pause-file':
 		source => 'puppet:///modules/ganeti2/cleanup-watcher-pause-file',
diff --git a/modules/ipsec/manifests/init.pp b/modules/ipsec/manifests/init.pp
index 5464f780c..d20860c8b 100644
--- a/modules/ipsec/manifests/init.pp
+++ b/modules/ipsec/manifests/init.pp
@@ -63,5 +63,5 @@ class ipsec {
 
   # Since we disable module loading after boot, we want to load them all at boot time
   $modules = split('af_alg af_key ah4 algif_skcipher ansi_cprng authenc drbg echainiv esp4 ipcomp macvlan macvtap tunnel4 vhost vhost_net xfrm4_mode_tunnel xfrm4_tunnel xfrm6_mode_tunnel xfrm_algo xfrm_ipcomp xfrm_user', ' ') # lint:ignore:140chars
-  site::linux_module { $modules: }
+  base::linux_module { $modules: }
 }
diff --git a/modules/site/manifests/linux_module.pp b/modules/site/manifests/linux_module.pp
deleted file mode 100644
index 36c09dcf3..000000000
--- a/modules/site/manifests/linux_module.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-define site::linux_module ($ensure = present) {
-	if $::kernel == linux {
-		case $ensure {
-			present: {
-				exec { "append_module_${name}":
-					command => "echo '${name}' >> /etc/modules",
-					unless => "grep -q -F -x '${name}' /etc/modules",
-				}
-			}
-			absent: {
-				exec { "remove_module_${name}":
-					command => "sed -i -e'/^${name}\$/d' /etc/modules",
-					onlyif => "grep -q -F -x '${name}' /etc/modules",
-				}
-			}
-			default: { fail ("invalid ensure value ${ensure}") }
-		}
-	}
-}
diff --git a/modules/tcp_bbr/manifests/init.pp b/modules/tcp_bbr/manifests/init.pp
index 78e966ec9..ab35b3554 100644
--- a/modules/tcp_bbr/manifests/init.pp
+++ b/modules/tcp_bbr/manifests/init.pp
@@ -31,14 +31,14 @@ class tcp_bbr {
 		   has_role('www_master') or
 		   false {
 
-			site::linux_module { 'tcp_bbr': }
-			site::linux_module { 'sch_fq': }
+			base::linux_module { 'tcp_bbr': }
+			base::linux_module { 'sch_fq': }
 
-			site::sysctl { 'puppet-net_core_default_qdisc':
+			base::sysctl { 'puppet-net_core_default_qdisc':
 				key   => 'net.core.default_qdisc',
 				value => 'fq',
 			}
-			site::sysctl { 'puppet-net_ipv4_tcp_congestion_control':
+			base::sysctl { 'puppet-net_ipv4_tcp_congestion_control':
 				key   => 'net.ipv4.tcp_congestion_control',
 				value => 'bbr',
 			}