Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175629
Change subject: Switch Cassandra test hosts to the new role class
......................................................................
Switch Cassandra test hosts to the new role class
- Move system::role under the role class.
- Get rid of the vm.max_map_count sysctl, included in Cassandra's Debian
package now.
- Split ruthenium off the host list, to be repurposed.
Change-Id: I3e5a4b95a906fd9797a731cafc80d8d94ca45db9
---
M manifests/role/cassandra.pp
M manifests/site.pp
2 files changed, 11 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/175629/1
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index de89d12..a3806ed 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -3,4 +3,8 @@
class role::cassandra {
# Parameters to be set by Hiera
class { '::cassandra': }
+
+ system::role { 'role::cassandra':
+ description => 'Cassandra server',
+ }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index cf0f987..e8682a2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -439,23 +439,11 @@
include role::releases
}
-# cerium,praseodymium, ruthenium and xenon are cassandra test host
-node /^(cerium|praseodymium|ruthenium|xenon)\.eqiad\.wmnet$/ {
-
+# cerium,praseodymium, ruthenium and xenon are cassandra test hosts
+node /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ {
class { 'admin': groups => ['cassandra-roots'] }
-
- system::role { 'role::cassandra-test':
- description => 'Cassandra test server',
- }
-
include standard
-
- # XXX: to be moved into the puppet class
- sysctl::parameters { 'cassandra':
- values => {
- 'vm.max_map_count' => 1048575,
- },
- }
+ include role::cassandra
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
@@ -2279,6 +2267,10 @@
class { 'admin': groups => ['pmacct-roots'] }
}
+node 'ruthenium.eqiad.wmnet' {
+ include standard
+}
+
node 'sanger.wikimedia.org' {
include base
include ganglia
--
To view, visit https://gerrit.wikimedia.org/r/175629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e5a4b95a906fd9797a731cafc80d8d94ca45db9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
