From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 10:28:15 +0000 (+0200)
Subject: turn porterbox into a real role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b2a6f14054fb5d39f29be46e49cb456fb5f43b5b;p=mirror%2Fdsa-puppet.git

turn porterbox into a real role
---

diff --git a/hieradata/nodes/abel.debian.org.yaml b/hieradata/nodes/abel.debian.org.yaml
index 14ec4d25f..08fe52e7d 100644
--- a/hieradata/nodes/abel.debian.org.yaml
+++ b/hieradata/nodes/abel.debian.org.yaml
@@ -1,2 +1,3 @@
 classes:
   - roles::broken_rtc
+  - roles::porterbox
diff --git a/hieradata/nodes/amdahl.debian.org.yaml b/hieradata/nodes/amdahl.debian.org.yaml
new file mode 100644
index 000000000..c24c0a50b
--- /dev/null
+++ b/hieradata/nodes/amdahl.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::porterbox
diff --git a/hieradata/nodes/barriere.debian.org.yaml b/hieradata/nodes/barriere.debian.org.yaml
new file mode 100644
index 000000000..c24c0a50b
--- /dev/null
+++ b/hieradata/nodes/barriere.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::porterbox
diff --git a/hieradata/nodes/eller.debian.org.yaml b/hieradata/nodes/eller.debian.org.yaml
index 14ec4d25f..08fe52e7d 100644
--- a/hieradata/nodes/eller.debian.org.yaml
+++ b/hieradata/nodes/eller.debian.org.yaml
@@ -1,2 +1,3 @@
 classes:
   - roles::broken_rtc
+  - roles::porterbox
diff --git a/hieradata/nodes/harris.debian.org.yaml b/hieradata/nodes/harris.debian.org.yaml
index 14ec4d25f..08fe52e7d 100644
--- a/hieradata/nodes/harris.debian.org.yaml
+++ b/hieradata/nodes/harris.debian.org.yaml
@@ -1,2 +1,3 @@
 classes:
   - roles::broken_rtc
+  - roles::porterbox
diff --git a/hieradata/nodes/minkus.debian.org.yaml b/hieradata/nodes/minkus.debian.org.yaml
new file mode 100644
index 000000000..c24c0a50b
--- /dev/null
+++ b/hieradata/nodes/minkus.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::porterbox
diff --git a/hieradata/nodes/plummer.debian.org.yaml b/hieradata/nodes/plummer.debian.org.yaml
new file mode 100644
index 000000000..c24c0a50b
--- /dev/null
+++ b/hieradata/nodes/plummer.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::porterbox
diff --git a/hieradata/nodes/zelenka.debian.org.yaml b/hieradata/nodes/zelenka.debian.org.yaml
new file mode 100644
index 000000000..c24c0a50b
--- /dev/null
+++ b/hieradata/nodes/zelenka.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::porterbox
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index cdf2db051..41aa80822 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -50,7 +50,7 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   if p.delete('buildd')
     entries += ", the Debian #{arch} build daemon"
   end
-  if p.delete('porterbox') or classes.include?("porterbox")
+  if classes.include?("roles::porterbox")
     entries += ", the Debian #{arch} porterbox"
   end
 
@@ -127,7 +127,7 @@ if scope.lookupvar('::cluster')
 end
 
 
-if classes.include?("porterbox")
+if classes.include?("roles::porterbox")
   purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:https://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.  There may be chroots for architectures other than #{arch} available, please list available chroots to check.")
 end
 
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index b0a91f157..c7af8ae6f 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -13,7 +13,6 @@ module Puppet::Parser::Functions
       nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber']])
       nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
       nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver'))
-      nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox'))
       nodeinfo['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host'))
 
       if lookupvar('::mta') == 'exim4'
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 65c23bc35..6ab0e974d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -20,11 +20,6 @@ class roles {
 		include buildd
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'porterbox') {
-		include porterbox
-	}
-
 	if has_role('bugs_mirror') {
 		include roles::bugs_mirror
 	}
diff --git a/modules/roles/manifests/porterbox.pp b/modules/roles/manifests/porterbox.pp
new file mode 100644
index 000000000..c0dc2a740
--- /dev/null
+++ b/modules/roles/manifests/porterbox.pp
@@ -0,0 +1,4 @@
+# debian.org porterbox
+class roles::porterbox {
+  include porterbox
+}
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index fc134cfe8..0faf5ec67 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -507,9 +507,6 @@ file=/usr/share/puppet-dashboard/public/javascripts/all.js
 dir=1/usr/share/puppet-dashboard/tmp/pids
 <% end -%>
 
-<% if classes.include?("porterbox") %>
-file=/etc/cron.weekly/puppet-mail-big-homedirs
-<% end -%>
 file=/etc/ssl/private/*.key-certchain
 dir=10/var/lib/puppet/clientbucket