Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381721 )
Change subject: mariadb: Remove db1036 for decommissioning
......................................................................
mariadb: Remove db1036 for decommissioning
db1036 is going to be decommissioned, removed from all the config files
and set it with spare role.
Bug: T176311
Change-Id: I64cfbcaa16526440bd393e8e48fd1fc575b71344
---
D hieradata/hosts/db1036.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
4 files changed, 6 insertions(+), 11 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1036.yaml b/hieradata/hosts/db1036.yaml
deleted file mode 100644
index 9b907d8..0000000
--- a/hieradata/hosts/db1036.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-mariadb::shard: 's2'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/manifests/site.pp b/manifests/site.pp
index dae5e1c..e1e5bde 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -356,7 +356,7 @@
}
# eqiad replicas
-node /^db1(021|036|060|074|076|090|101)\.eqiad\.wmnet/ {
+node /^db1(021|060|074|076|090|101)\.eqiad\.wmnet/ {
role(mariadb::core)
}
@@ -370,6 +370,11 @@
role(spare::system)
}
+# To be decommissioned in T176311
+node 'db1036.eqiad.wmnet' {
+ role(spare::system)
+}
+
# s2 (large wikis) core production dbs on codfw
# codfw master
node 'db2017.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 8e45ac7..81ea7e6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -986,13 +986,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host db1036 {
- hardware ethernet 78:2b:cb:04:fc:5f;
- fixed-address db1036.eqiad.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host db1038 {
hardware ethernet 84:2b:2b:18:59:3e;
fixed-address db1038.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 0d2dfa9..ee0c3a8 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -22,7 +22,6 @@
role: slave
targets:
- db1021:9104
- - db1036:9104
- db1060:9104
- db1067:9104
- db1074:9104
--
To view, visit https://gerrit.wikimedia.org/r/381721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64cfbcaa16526440bd393e8e48fd1fc575b71344
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
