Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384455 )
Change subject: mariadb: Remove db1050 from config
......................................................................
mariadb: Remove db1050 from config
db1050 is going to be decommissioned
Bug: T178162
Change-Id: Ib95b6d00b86d76b6390f6d3a08faaae6b74e4d76
---
D hieradata/hosts/db1050.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, 7 insertions(+), 11 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1050.yaml b/hieradata/hosts/db1050.yaml
deleted file mode 100644
index f41d15a..0000000
--- a/hieradata/hosts/db1050.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-mariadb::shard: 's6'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/manifests/site.pp b/manifests/site.pp
index 42ca1db..21f87d8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -468,7 +468,7 @@
role(mariadb::core)
}
-node /^db10(30|50|85|88|93|98)\.eqiad\.wmnet/ {
+node /^db10(30|85|88|93|98)\.eqiad\.wmnet/ {
role(mariadb::core)
}
@@ -477,6 +477,12 @@
role(spare::system)
}
+# To be decommissioned in T178162
+node 'db1050.eqiad.wmnet' {
+ role(spare::system)
+}
+
+
#
# s6 core production dbs on codfw
# codfw master
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 854433c..373bb73 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -997,13 +997,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host db1050 {
- hardware ethernet d4:ae:52:65:92:b1;
- fixed-address db1050.eqiad.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host db1051 {
hardware ethernet 90:B1:1C:2A:B0:2C;
fixed-address db1051.eqiad.wmnet;
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 15cb1f9..4776768 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -92,7 +92,6 @@
role: slave
targets:
- db1030:9104
- - db1050:9104
- db1085:9104
- db1088:9104
- db1093:9104
--
To view, visit https://gerrit.wikimedia.org/r/384455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib95b6d00b86d76b6390f6d3a08faaae6b74e4d76
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <maroste...@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
