Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274076
Change subject: Decommision pc100[123]
......................................................................
Decommision pc100[123]
Bug: T124962
Change-Id: I5dc825961ea6a8ae230db9fe5863a2b0d7edd888
---
M hieradata/regex.yaml
M manifests/role/mariadb.pp
M manifests/site.pp
M modules/admin/files/enforce-users-groups.sh
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
6 files changed, 4 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/274076/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index adda73c..48a9b26 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -59,7 +59,7 @@
elasticsearch::row: D
mysql:
- __regex: !ruby/regexp
/^(db10[0-9][0-9]|dbstore100[1-2]|dbproxy100[1-4]|es10[0-1][1-9]|labsdb100[1-4]|pc100[1-3])\.eqiad\.wmnet$/
+ __regex: !ruby/regexp
/^(db10[0-9][0-9]|dbstore100[1-2]|dbproxy100[1-5]|es10[0-1][1-9]|labsdb100[1-5]|pc100[4-6])\.eqiad\.wmnet$/
cluster: mysql
virtualization:
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 450e63a..bddfb24 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -780,10 +780,8 @@
shard => 'parsercache',
}
- $basedir = $hostname ? {
- /pc100[123]/ => '/a',
- default => '/srv',
- }
+ # old servers used to be installed on /a
+ $basedir = '/srv'
class { 'mariadb::config':
prompt => 'PARSERCACHE',
diff --git a/manifests/site.pp b/manifests/site.pp
index 26f0dca..ba9cdb2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2176,10 +2176,6 @@
}
# parser cache databases
-# old eqiad to be replaced
-node /pc100[1-3]\.eqiad\.wmnet/ {
- role mariadb::parsercache
-}
# eqiad
node /pc100[4-6]\.eqiad\.wmnet/ {
role mariadb::parsercache
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index 1af9f0a..595ffb9 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -17,7 +17,7 @@
"gerrit2" \ # ytterbium.wikimedia.org
"releases" \ # tin.eqiad.wmnet/mira.codfw.wmnet
"reprepro" \ # bromine.eqiad.wmnet
- "mysql" \ # pc1001.eqiad.wmnet
+ "mysql" \ # pc1001.eqiad.wmnet (still needed?)
"dbmon" \ # db1044.eqiad.wmnet
"parsoid-rt" \ # ruthenium.eqiad.wmnet T90966
"datasets" ); # snapshot*, dataset*, ms1001
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 6f8249a..3d553e4 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -113,7 +113,6 @@
labservices1001|radium|scandium|silver|uranium) echo partman/raid1.cfg
;; \
rdb100[7-8]) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
- pc100[1-3]) echo partman/mw.cfg ;; \
pc100[4-6]|pc200[4-6]) echo partman/raid0-lvm-srv.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-6]) echo partman/mw.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index b910df9..366c798 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -95,21 +95,6 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
-host pc1001 {
- hardware ethernet 00:22:bd:d3:38:62;
- fixed-address pc1001.eqiad.wmnet;
-}
-
-host pc1002 {
- hardware ethernet 00:22:BD:D3:60:4A;
- fixed-address pc1002.eqiad.wmnet;
-}
-
-host pc1003 {
- hardware ethernet 88:43:E1:C2:51:50;
- fixed-address pc1003.eqiad.wmnet;
-}
-
host planet1001 {
hardware ethernet aa:00:00:19:24:b9;
fixed-address planet1001.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/274076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dc825961ea6a8ae230db9fe5863a2b0d7edd888
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
