From: Julien Cristau <jcristau@debian.org>
Date: Mon, 18 Nov 2019 14:25:17 +0000 (+0100)
Subject: Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fd4692bb28eab3e802fe792a2e23fd7af05a3cdf;hp=56c3cde5bff3e3486e2236af13597d99072f8142;p=mirror%2Fdsa-puppet.git

Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
---

diff --git a/manifests/site.pp b/manifests/site.pp
index ba5b9a128..f6bce78ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,7 +41,7 @@ node default {
 		include acpi
 	}
 
-	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,gretchaninov,sibelius] {
 		include nfs_server
 	}
 
diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index cf3ddb8c5..fc57c0551 100644
--- a/modules/autofs/manifests/init.pp
+++ b/modules/autofs/manifests/init.pp
@@ -1,7 +1,7 @@
 # Set up NFS mounts via autofs
 class autofs {
   case $::hostname {
-    piu-slave-bm-a, picconi, sor, tate, respighi: {
+    picconi, sor, tate, respighi: {
       include autofs::bytemark
     }
     lw07,lw08: {
diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index cc5795d8f..b6d5a5645 100644
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -78,7 +78,6 @@ nameinfo:
   schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856)
   sechter.debian.org: Simon Sechter (October 11th, 1788 - September 10th, 1867)
   seger.debian.org: Josef Seger (March 21st, 1716 - April 22nd, 1782)
-  senfter.debian.org: Johanna Senfter (November, 27th, 1879 - August 11th, 1961)
   setoguchi.debian.org: 瀬戸口藤吉, Tokichi Setoguchi (June 28th, 1868 - November 8th, 1941)
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
   smit.debian.org: Leo Smit (May 14th, 1900 - April 30th, 1943)
diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 7d6a547cb..05943a2bb 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -142,11 +142,11 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad345cee645401000000
-		alias	piu-slave-bm-a
+		alias	OLD-piu-slave-bm-a
 	}
 	multipath {
 		wwid	3600c0ff000d5ad3465ee645401000000
-		alias	piu-slave-bm-a-swap
+		alias	OLD-piu-slave-bm-a-swap
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34fa5d6a5401000000
@@ -182,15 +182,15 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
-		alias	senfter
+		alias	OLD-senfter
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34c3bd675401000000
-		alias	senfter-lvm
+		alias	OLD-senfter-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad3441148d5801000000
-		alias	senfter-lvm2
+		alias	OLD-senfter-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
diff --git a/modules/nfs_server/manifests/init.pp b/modules/nfs_server/manifests/init.pp
index e5b25e569..d31fa1c68 100644
--- a/modules/nfs_server/manifests/init.pp
+++ b/modules/nfs_server/manifests/init.pp
@@ -20,7 +20,7 @@ class nfs_server {
 		lw01,lw02,lw03,lw04,lw09,lw10: {
 			$client_range    = '(172.29.188.0/24)'
 		}
-		milanollo,senfter: {
+		milanollo: {
 			$client_range    = '172.29.122.0/24'
 		}
 		buxtehude: {
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index db0d9d556..e6b0ddd20 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -37,7 +37,7 @@ Host_Alias	DELLHOSTS	= schumann, wieck, manda-node03, manda-node04, schmelzer, s
 Host_Alias	LISTHOSTS	= bendel
 Host_Alias	BUILDD_MASTER	= wuiet
 Host_Alias	PORTERBOXES	= abel, amdahl, barriere, eller, harris, minkus, plummer, zelenka
-Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a, piu-slave-ubc-01
+Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-ubc-01
 Host_Alias	MQ_HOSTS	= rainier, rapoport
 
 # Cmnd alias specification