Pyoungmeister has submitted this change and it was merged.
Change subject: adding db72 to s4 and db73 to s5
......................................................................
adding db72 to s4 and db73 to s5
Change-Id: I8c40c4d15d6b4512505dad7e0cbbf5cb4c275120
---
M manifests/role/coredb.pp
M manifests/site.pp
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 13ee50e..e3a68df 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -33,7 +33,7 @@
'no_master' => []
},
's4' => {
- 'hosts' => { 'pmtpa' => [ 'db31', 'db33', 'db51',
'db65' ],
+ 'hosts' => { 'pmtpa' => [ 'db31', 'db33', 'db51',
'db65', 'db72' ],
'eqiad' => [ 'db1004', 'db1011', 'db1020',
'db1038' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db31", 'eqiad' => "db1038" },
@@ -41,7 +41,7 @@
'no_master' => []
},
's5' => {
- 'hosts' => { 'pmtpa' => [ 'db35', 'db44', 'db45',
'db55' ],
+ 'hosts' => { 'pmtpa' => [ 'db35', 'db44', 'db45',
'db55', 'db73' ],
'eqiad' => [ 'db1005', 'db1021', 'db1026',
'db1039' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db45", 'eqiad' => "db1039" },
diff --git a/manifests/site.pp b/manifests/site.pp
index be42dc8..5817c08 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -428,23 +428,23 @@
}
}
-node /^db(31|33|51|65)\.pmtpa\.wmnet/ {
+node /^db(31|33|51|65|72)\.pmtpa\.wmnet/ {
if $hostname =~ /^db51/ {
$ganglia_aggregator = "true"
}
if $hostname == "db51" {
class { role::coredb::s4 : mariadb => true }
- } elsif $hostname == "db65"{
+ } elsif $hostname =~ /^db(65|72)/ {
class { role::coredb::s4 : innodb_file_per_table => true }
} else {
include role::coredb::s4
}
}
-node /^db(35|44|45|55)\.pmtpa\.wmnet/ {
+node /^db(35|44|45|55|73)\.pmtpa\.wmnet/ {
if $hostname == "db35" {
class { role::coredb::s5 : mariadb => true }
- } elsif $hostname == "db55"{
+ } elsif $hostname =~ /^db(55|73)/{
class { role::coredb::s5 : innodb_file_per_table => true }
} else {
include role::coredb::s5
@@ -528,7 +528,7 @@
## not in use for various reasons
-node /^db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
+node /^db(42|6[12]|7[4-7])\.pmtpa\.wmnet/{
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/59186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c40c4d15d6b4512505dad7e0cbbf5cb4c275120
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
