Faidon has submitted this change and it was merged.
Change subject: Ceph: switch 3rd monitor ms-be1005 -> ms-fe1004
......................................................................
Ceph: switch 3rd monitor ms-be1005 -> ms-fe1004
We moved ms-fe1004 to row C now, so we can keep the setup homogeneous by
having monitors only on ms-fe nodes, one per row.
Change-Id: I9ccb0b9b75d040ed3ad45f0d48373f8dbf471a21
---
M manifests/role/ceph.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 9 deletions(-)
Approvals:
Faidon: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ceph.pp b/manifests/role/ceph.pp
index 74ca2a1..3ef53ba 100644
--- a/manifests/role/ceph.pp
+++ b/manifests/role/ceph.pp
@@ -16,14 +16,14 @@
config => {
fsid => 'c9da36e1-694a-4166-b346-9d8d4d1d1ac1',
mon_initial_members => [
- 'ms-fe1001',
- 'ms-fe1003',
- 'ms-be1005',
+ 'ms-fe1001',
+ 'ms-fe1003',
+ 'ms-fe1004',
],
mon_addresses => [
'10.64.0.167:6789', # ms-fe1001
'10.64.16.150:6789', # ms-fe1003
- '10.64.32.10:6789', # ms-be1005
+ '10.64.32.92:6789', # ms-fe1004
],
'global' => {
# eqiad hardware has H710s which have a BBU
diff --git a/manifests/site.pp b/manifests/site.pp
index 365da8a..e3817c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1879,17 +1879,13 @@
include role::ceph::eqiad::radosgw
- if $::hostname =~ /^ms-fe100[13]$/ {
+ if $::hostname =~ /^ms-fe100[134]$/ {
include role::ceph::eqiad::mon
}
}
node /^ms-be10[01][0-9]\.eqiad\.wmnet$/ {
include role::ceph::eqiad::osd
-
- if $::hostname == 'ms-be1005' {
- include role::ceph::eqiad::mon
- }
}
node /^ms-be300[1-4]\.esams\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/67926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ccb0b9b75d040ed3ad45f0d48373f8dbf471a21
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
