Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405273 )
Change subject: mariadb: Decommission old codfw masters
......................................................................
mariadb: Decommission old codfw masters
Set as spare and remove all references to:
* db2016
* db2017
* db2018
* db2019
* db2023
* db2028
* db2029
Bug: T184090
Change-Id: If48a5879911e2ae6a678349936525e8fee2c0f08
---
D hieradata/hosts/db2016.yaml
D hieradata/hosts/db2017.yaml
D hieradata/hosts/db2018.yaml
D hieradata/hosts/db2019.yaml
D hieradata/hosts/db2023.yaml
D hieradata/hosts/db2029.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
8 files changed, 30 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/hieradata/hosts/db2016.yaml b/hieradata/hosts/db2016.yaml
deleted file mode 100644
index e60febc..0000000
--- a/hieradata/hosts/db2016.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's1'
diff --git a/hieradata/hosts/db2017.yaml b/hieradata/hosts/db2017.yaml
deleted file mode 100644
index c9e2327..0000000
--- a/hieradata/hosts/db2017.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's2'
diff --git a/hieradata/hosts/db2018.yaml b/hieradata/hosts/db2018.yaml
deleted file mode 100644
index 654805a..0000000
--- a/hieradata/hosts/db2018.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's3'
diff --git a/hieradata/hosts/db2019.yaml b/hieradata/hosts/db2019.yaml
deleted file mode 100644
index 7db8adb..0000000
--- a/hieradata/hosts/db2019.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's4'
diff --git a/hieradata/hosts/db2023.yaml b/hieradata/hosts/db2023.yaml
deleted file mode 100644
index 987af0e..0000000
--- a/hieradata/hosts/db2023.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-mariadb::shard: 's5'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db2029.yaml b/hieradata/hosts/db2029.yaml
deleted file mode 100644
index e7f2f00..0000000
--- a/hieradata/hosts/db2029.yaml
+++ /dev/null
@@ -1 +0,0 @@
-mariadb::shard: 's7'
diff --git a/manifests/site.pp b/manifests/site.pp
index 26a8360..f8300ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -296,7 +296,7 @@
}
# codfw replicas
-node /^db20(16|42|55|62|69|70|71|72)\.codfw\.wmnet/ {
+node /^db20(42|55|62|69|70|71|72)\.codfw\.wmnet/ {
role(mariadb::core)
}
@@ -318,7 +318,7 @@
role(mariadb::core)
}
-node /^db20(17|41|49|56|63|64)\.codfw\.wmnet/ {
+node /^db20(41|49|56|63|64)\.codfw\.wmnet/ {
role(mariadb::core)
}
@@ -339,7 +339,7 @@
role(mariadb::core)
}
-node /^db20(18|36|50|57|74)\.codfw\.wmnet/ {
+node /^db20(36|50|57|74)\.codfw\.wmnet/ {
role(mariadb::core)
}
@@ -364,7 +364,7 @@
role(mariadb::core)
}
-node /^db20(19|37|44|58|65|73)\.codfw\.wmnet/ {
+node /^db20(37|44|58|65|73)\.codfw\.wmnet/ {
role(mariadb::core)
}
@@ -386,7 +386,7 @@
}
# See also db2084 and db2089 below
-node /^db20(23|38|59|66|75)\.codfw\.wmnet/ {
+node /^db20(38|59|66|75)\.codfw\.wmnet/ {
role(mariadb::core)
}
@@ -409,10 +409,6 @@
node /^db20(46|53|60|67|76)\.codfw\.wmnet/ {
role(mariadb::core)
-}
-
-node 'db2028.codfw.wmnet' {
- role(spare::system)
}
# s7 (centralauth, meta et al.) core production dbs on eqiad
@@ -442,7 +438,7 @@
role(mariadb::core)
}
-node /^db20(29|47|54|61|68|77)\.codfw\.wmnet/ {
+node /^db20(47|54|61|68|77)\.codfw\.wmnet/ {
role(mariadb::core)
}
@@ -476,6 +472,29 @@
role(mariadb::core_multiinstance)
}
+# pending to be decommissioned T184090
+node 'db2016.codfw.wmnet' {
+ role(spare::system)
+}
+node 'db2017.codfw.wmnet' {
+ role(spare::system)
+}
+node 'db2018.codfw.wmnet' {
+ role(spare::system)
+}
+node 'db2019.codfw.wmnet' {
+ role(spare::system)
+}
+node 'db2023.codfw.wmnet' {
+ role(spare::system)
+}
+node 'db2028.codfw.wmnet' {
+ role(spare::system)
+}
+node 'db2029.codfw.wmnet' {
+ role(spare::system)
+}
+
# pending to be provisioned T170662
node 'db2092.codfw.wmnet' {
role(spare::system)
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index bc2bd94..e30db9a 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -2,7 +2,6 @@
shard: s1
role: slave
targets:
- - db2016:9104
- db2042:9104
- db2055:9104
- db2062:9104
@@ -22,7 +21,6 @@
shard: s2
role: slave
targets:
- - db2017:9104
- db2041:9104
- db2049:9104
- db2056:9104
@@ -40,7 +38,6 @@
shard: s3
role: slave
targets:
- - db2018:9104
- db2036:9104
- db2050:9104
- db2057:9104
@@ -57,7 +54,6 @@
targets:
- db2037:9104
- db2044:9104
- - db2051:9104
- db2058:9104
- db2065:9104
- db2073:9104
@@ -67,13 +63,12 @@
shard: s4
role: master
targets:
- - db2019:9104
+ - db2051:9104
- labels:
shard: s5
role: slave
targets:
- - db2023:9104
- db2038:9104
- db2059:9104
- db2066:9104
@@ -107,7 +102,6 @@
shard: s7
role: slave
targets:
- - db2029:9104
- db2047:9104
- db2054:9104
- db2061:9104
--
To view, visit https://gerrit.wikimedia.org/r/405273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If48a5879911e2ae6a678349936525e8fee2c0f08
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[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
