ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102194
Change subject: remove amssq31-46 from dsh and other squid related manifests
......................................................................
remove amssq31-46 from dsh and other squid related manifests
they will be reinstalled as varnish hosts later (rt #6523)
so we keep dhcp entries, adjust netboot.conf for the new use
Change-Id: Ice56f660cd89bfe6f9179d23c4f578b55a09f37e
---
M files/dsh/group/ams
M files/dsh/group/amssq
M files/dsh/group/knams.text
M files/dsh/group/squids_esams_text
M files/dsh/group/squids_knams
M modules/install-server/files/autoinstall/netboot.cfg
6 files changed, 1 insertion(+), 81 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/102194/1
diff --git a/files/dsh/group/ams b/files/dsh/group/ams
index f354f4c..7c8d9d4 100644
--- a/files/dsh/group/ams
+++ b/files/dsh/group/ams
@@ -2,22 +2,6 @@
amslvs2
amslvs3
amslvs4
-amssq31
-amssq32
-amssq33
-amssq34
-amssq35
-amssq36
-amssq37
-amssq38
-amssq39
-amssq40
-amssq41
-amssq42
-amssq43
-amssq44
-amssq45
-amssq46
amssq47
amssq48
amssq49
diff --git a/files/dsh/group/amssq b/files/dsh/group/amssq
index fe31279..83ca1da 100644
--- a/files/dsh/group/amssq
+++ b/files/dsh/group/amssq
@@ -1,19 +1,3 @@
-amssq31
-amssq32
-amssq33
-amssq34
-amssq35
-amssq36
-amssq37
-amssq38
-amssq39
-amssq40
-amssq41
-amssq42
-amssq43
-amssq44
-amssq45
-amssq46
amssq47
amssq48
amssq49
diff --git a/files/dsh/group/knams.text b/files/dsh/group/knams.text
index 90dd8c7..e69de29 100644
--- a/files/dsh/group/knams.text
+++ b/files/dsh/group/knams.text
@@ -1,16 +0,0 @@
-amssq31.esams.wikimedia.org
-amssq32.esams.wikimedia.org
-amssq33.esams.wikimedia.org
-amssq34.esams.wikimedia.org
-amssq35.esams.wikimedia.org
-amssq36.esams.wikimedia.org
-amssq37.esams.wikimedia.org
-amssq38.esams.wikimedia.org
-amssq39.esams.wikimedia.org
-amssq40.esams.wikimedia.org
-amssq41.esams.wikimedia.org
-amssq42.esams.wikimedia.org
-amssq43.esams.wikimedia.org
-amssq44.esams.wikimedia.org
-amssq45.esams.wikimedia.org
-amssq46.esams.wikimedia.org
diff --git a/files/dsh/group/squids_esams_text
b/files/dsh/group/squids_esams_text
index 90dd8c7..e69de29 100644
--- a/files/dsh/group/squids_esams_text
+++ b/files/dsh/group/squids_esams_text
@@ -1,16 +0,0 @@
-amssq31.esams.wikimedia.org
-amssq32.esams.wikimedia.org
-amssq33.esams.wikimedia.org
-amssq34.esams.wikimedia.org
-amssq35.esams.wikimedia.org
-amssq36.esams.wikimedia.org
-amssq37.esams.wikimedia.org
-amssq38.esams.wikimedia.org
-amssq39.esams.wikimedia.org
-amssq40.esams.wikimedia.org
-amssq41.esams.wikimedia.org
-amssq42.esams.wikimedia.org
-amssq43.esams.wikimedia.org
-amssq44.esams.wikimedia.org
-amssq45.esams.wikimedia.org
-amssq46.esams.wikimedia.org
diff --git a/files/dsh/group/squids_knams b/files/dsh/group/squids_knams
index d1e6513..8b13789 100644
--- a/files/dsh/group/squids_knams
+++ b/files/dsh/group/squids_knams
@@ -1,17 +1 @@
-amssq31
-amssq32
-amssq33
-amssq34
-amssq35
-amssq36
-amssq37
-amssq38
-amssq39
-amssq40
-amssq41
-amssq42
-amssq43
-amssq44
-amssq45
-amssq46
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 609feea..5232d03 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -32,7 +32,7 @@
\
case $(debconf-get netcfg/get_hostname) in \
amslvs*) echo partman/raid1-squid.cfg ;; \
- amssq4[7-9]|amssq[56][0-9]) echo partman/raid1-varnish.cfg ;; \
+ amssq3[1-9]|amssq4[0-9]|amssq[56][0-9]) echo
partman/raid1-varnish.cfg ;; \
amssq*|sq[6][7-9]|sq70) echo partman/raid1-squid.cfg ;; \
analytics100[1-9]|analytics1010) echo
partman/analytics-cisco.cfg ;; \
analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg
;; \
--
To view, visit https://gerrit.wikimedia.org/r/102194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice56f660cd89bfe6f9179d23c4f578b55a09f37e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
