Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393525 )
Change subject: mariadb: Prepare to decommission db1021
......................................................................
mariadb: Prepare to decommission db1021
db1021's data was copied over db1053 so it is ready to be
decommissioned.
Set it to spare and removed from everywhere else
Bug: T181378
Change-Id: Ia5963b13294d7e9b10953433fb039ad21f538e93
---
D hieradata/hosts/db1021.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(+), 9 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1021.yaml b/hieradata/hosts/db1021.yaml
deleted file mode 100644
index 9b907d8..0000000
--- a/hieradata/hosts/db1021.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 39081b8..41234a9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -338,10 +338,15 @@
}
# eqiad replicas
-node /^db1(021|053|060|074|076|090)\.eqiad\.wmnet/ {
+node /^db1(053|060|074|076|090)\.eqiad\.wmnet/ {
role(mariadb::core)
}
+node 'db1021.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 c9289a0..bbdf0e6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -921,11 +921,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host db1021 {
- hardware ethernet 78:2b:cb:03:ca:38;
- fixed-address db1021.eqiad.wmnet;
-}
-
host db1029 {
hardware ethernet 78:2b:cb:03:dd:32;
fixed-address db1029.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 01e8d9c..5794333 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -20,7 +20,6 @@
shard: s2
role: slave
targets:
- - db1021:9104
- db1060:9104
- db1053:9104
- db1067:9104
--
To view, visit https://gerrit.wikimedia.org/r/393525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5963b13294d7e9b10953433fb039ad21f538e93
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
