Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403451 )
Change subject: mariadb: Promote db2040 to be the codfw-s7 master instead of
db2029
......................................................................
mariadb: Promote db2040 to be the codfw-s7 master instead of db2029
Bug: T176243
Change-Id: I3503ef12df13cbffc03bfa859e3a8b4e0b58db95
---
M hieradata/hosts/db2029.yaml
M hieradata/hosts/db2040.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
4 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Marostegui: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/hieradata/hosts/db2029.yaml b/hieradata/hosts/db2029.yaml
index 9682add..e7f2f00 100644
--- a/hieradata/hosts/db2029.yaml
+++ b/hieradata/hosts/db2029.yaml
@@ -1,4 +1 @@
mariadb::shard: 's7'
-mariadb::mysql_role: 'master'
-mariadb::binlog_format: 'STATEMENT'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db2040.yaml b/hieradata/hosts/db2040.yaml
index e7f2f00..02e6781 100644
--- a/hieradata/hosts/db2040.yaml
+++ b/hieradata/hosts/db2040.yaml
@@ -1 +1,3 @@
mariadb::shard: 's7'
+mariadb::mysql_role: 'master'
+mariadb::binlog_format: 'STATEMENT'
diff --git a/manifests/site.pp b/manifests/site.pp
index ea86f06..b5b4d43 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -447,11 +447,11 @@
#
# s7 (centralauth, meta et al.) core production dbs on codfw
# codfw master
-node 'db2029.codfw.wmnet' {
+node 'db2040.codfw.wmnet' {
role(mariadb::core)
}
-node /^db20(40|47|54|61|68|77)\.codfw\.wmnet/ {
+node /^db20(29|47|54|61|68|77)\.codfw\.wmnet/ {
role(mariadb::core)
}
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 423fd88..641d4ea 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -108,7 +108,7 @@
shard: s7
role: slave
targets:
- - db2040:9104
+ - db2029:9104
- db2047:9104
- db2054:9104
- db2061:9104
@@ -120,7 +120,7 @@
shard: s7
role: master
targets:
- - db2029:9104
+ - db2040:9104
- labels:
shard: s8
--
To view, visit https://gerrit.wikimedia.org/r/403451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3503ef12df13cbffc03bfa859e3a8b4e0b58db95
Gerrit-PatchSet: 4
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
