Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: add new ms-be machines to eqiad/codfw
......................................................................
swift: add new ms-be machines to eqiad/codfw
also restrict the node definition in codfw to cover only known machines
Bug: T114500
Change-Id: Iae76a273cc49203fd040baeedd9da91c7e3560de
---
M hieradata/regex.yaml
M manifests/site.pp
2 files changed, 21 insertions(+), 5 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index bf155e9..d02c6e8 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -176,8 +176,8 @@
- .*\.min$
- .*\.stddev$
-swift_be_codfw:
- __regex: !ruby/regexp /^ms-be20.*\.codfw\.wmnet$/
+swift_be_codfw_dell:
+ __regex: !ruby/regexp /^ms-be20(0[0-9]|1[0-5])\.codfw\.wmnet$/
swift_storage_drives: [
'/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
@@ -185,6 +185,17 @@
# no trailing comma!
]
swift_aux_partitions: ['/dev/sdm3', '/dev/sdn3']
+
+# HP machines have different disk ordering T90922
+swift_be_codfw_hp:
+ __regex: !ruby/regexp /^ms-be20(1[6-9]|2[0-1])\.codfw\.wmnet$/
+ swift_storage_drives: [
+ '/dev/sdm', '/dev/sdn', '/dev/sdc', '/dev/sdd',
+ '/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
+ '/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
+ # no trailing comma!
+ ]
+ swift_aux_partitions: ['/dev/sda3', '/dev/sdb3']
swift_be_eqiad_dell:
__regex: !ruby/regexp /^ms-be10(0[0-9]|1[0-5])\.eqiad\.wmnet$/
@@ -198,7 +209,7 @@
# HP machines have different disk ordering T90922
swift_be_eqiad_hp:
- __regex: !ruby/regexp /^ms-be101[678]\.eqiad\.wmnet$/
+ __regex: !ruby/regexp /^ms-be10(1[6-9]|2[0-1])\.eqiad\.wmnet$/
swift_storage_drives: [
'/dev/sdm', '/dev/sdn', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
diff --git a/manifests/site.pp b/manifests/site.pp
index 9d1b727..2ba8d55 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1835,7 +1835,7 @@
}
# HP machines have different disk ordering T90922
-node /^ms-be101[678]\.eqiad\.wmnet$/ {
+node /^ms-be10(1[6-9]|2[0-1])\.eqiad\.wmnet$/ {
role swift::storage
}
@@ -1861,7 +1861,12 @@
include ::lvs::realserver
}
-node /^ms-be20[0-9][0-9]\.codfw\.wmnet$/ {
+node /^ms-be20(0[0-9]|1[0-5])\.codfw\.wmnet$/ {
+ role swift::storage
+}
+
+# HP machines have different disk ordering T90922
+node /^ms-be20(1[6-9]|2[0-1])\.codfw\.wmnet$/ {
role swift::storage
}
--
To view, visit https://gerrit.wikimedia.org/r/250684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae76a273cc49203fd040baeedd9da91c7e3560de
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
