Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402766 )
Change subject: mariadb: Remove db1039
......................................................................
mariadb: Remove db1039
db1039 is going to be decommissioned
Bug: T184262
Change-Id: Ia0ee5c411c5f01bfe23fc96dc730f6ac26e697cd
---
D hieradata/hosts/db1039.yaml
M hieradata/regex.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/files/prometheus/mysql-core_eqiad.yaml
5 files changed, 10 insertions(+), 13 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1039.yaml b/hieradata/hosts/db1039.yaml
deleted file mode 100644
index 082b36e..0000000
--- a/hieradata/hosts/db1039.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-mariadb::shard: 's7'
-mariadb::socket: '/tmp/mysql.sock'
-profile::base::notifications_enabled: '0'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 537e6b3..b0f9d22 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -254,7 +254,7 @@
profile::base::check_smart: true
smart_health_eqiad:
- __regex: !ruby/regexp
/^(analytics10[234][0-9]|aqs1004|conf1001|cp1045|db1039|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1.*|kafka1001|kafka-jumbo1001|kube.*|labmon1001|labcontrol1001|labvirt1001|labvirt1010|labsdb1009|labstore1006|lvs1007logstash1008|mw11.*|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|phab1001|poolcounter1001|mwlog1001|netmon1.*|puppetmaster1001|pc1004|sca1003|scb1001|thumbor1.*|tin|tungsten|wdqs1003|wtp1025|xenon).eqiad\.wmnet$/
+ __regex: !ruby/regexp
/^(analytics10[234][0-9]|aqs1004|conf1001|cp1045|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1.*|kafka1001|kafka-jumbo1001|kube.*|labmon1001|labcontrol1001|labvirt1001|labvirt1010|labsdb1009|labstore1006|lvs1007logstash1008|mw11.*|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|phab1001|poolcounter1001|mwlog1001|netmon1.*|puppetmaster1001|pc1004|sca1003|scb1001|thumbor1.*|tin|tungsten|wdqs1003|wtp1025|xenon).eqiad\.wmnet$/
profile::base::check_smart: true
labtestpuppetmaster:
diff --git a/manifests/site.pp b/manifests/site.pp
index a9a879f..1e71e7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,13 +430,21 @@
role(mariadb::core)
}
-node /^db10(39|69|79|86|94)\.eqiad\.wmnet/ {
+node /^db10(69|79|86|94)\.eqiad\.wmnet/ {
role(mariadb::core)
}
+# To be decommissioned T182556
node 'db1034.eqiad.wmnet' {
role(spare::system)
}
+
+# To be decommissioned T184262
+node 'db1039.eqiad.wmnet' {
+ role(spare::system)
+}
+
+#
# s7 (centralauth, meta et al.) core production dbs on codfw
# codfw master
node 'db2029.codfw.wmnet' {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index d33b132..3c778da 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -940,13 +940,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host db1039 {
- hardware ethernet 78:2b:cb:04:fc:98;
- fixed-address db1039.eqiad.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host db1043 {
hardware ethernet 78:2b:cb:03:dd:3b;
fixed-address db1043.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 6cf92ee..c140642 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -100,7 +100,6 @@
shard: s7
role: slave
targets:
- - db1039:9104
- db1069:9104
- db1079:9104
- db1086:9104
--
To view, visit https://gerrit.wikimedia.org/r/402766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0ee5c411c5f01bfe23fc96dc730f6ac26e697cd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
