From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 4 Jun 2017 11:32:32 +0000 (+0200)
Subject: decommission httpredir-bm-01
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6800e1e9e21c1f61864b0cb48cba5912c11eb941;p=mirror%2Fdsa-puppet.git

decommission httpredir-bm-01

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 01f821d8b..fd34e41c2 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -48,7 +48,7 @@ roles:
   historicalpackages:
     - hier.debian.org
   httpredir:
-    - httpredir-bm-01.debian.org
+    - dummy
   jenkins:
     - jerea.debian.org
   keyring:
diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index ae7551f49..be294d3e5 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -112,14 +112,6 @@ multipaths {
 		wwid	3600c0ff000d5ad348d70635401000000
 		alias	gideon-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34bcd0635401000000
-		alias	httpredir-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d75b58ed4d215701000000
-		alias	httpredir-bm-01-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea