Elukey has uploaded a new change for review. https://gerrit.wikimedia.org/r/288373
Change subject: Add a new AQS testing environment to play with Cassandra settings before production. ...................................................................... Add a new AQS testing environment to play with Cassandra settings before production. Not sure if this is the best way to do it but the idea is to use the aqs role for aqs100[456] and to override the cassandra/restbase hieradata settings with host level specific ones. This should allow a testing replica of AQS without affecting the existing cluster. Bug: T124314 Change-Id: I504a9536c28ee839ea9a11f2f5950f0742bb94b0 --- A hieradata/hosts/aqs1004 A hieradata/hosts/aqs1005 A hieradata/hosts/aqs1006 M manifests/site.pp 4 files changed, 99 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/288373/1 diff --git a/hieradata/hosts/aqs1004 b/hieradata/hosts/aqs1004 new file mode 100644 index 0000000..22089a2 --- /dev/null +++ b/hieradata/hosts/aqs1004 @@ -0,0 +1,31 @@ +# Analytics Query Service - Testing node + +cassandra::seeds: + - aqs1004.eqiad.wmnet + - aqs1005.eqiad.wmnet + - aqs1006.eqiad.wmnet + +cassandra::instances: + a: + jmx_port: 7189 + listen_address: 10.64.0.126 #aqs1004-a.eqiad.wmnet + rpc_address: 10.64.0.126 + rpc_interface: eth0 + b: + jmx_port: 7190 + listen_address: 10.64.0.127 #aqs1004-b.eqiad.wmnet + rpc_address: 10.64.0.127 #aqs1004-b.eqiad.wmnet + rpc_interface: eth0 + +# +# AQS service +# +aqs::seeds: + - aqs1004.eqiad.wmnet + - aqs1005.eqiad.wmnet + - aqs1006.eqiad.wmnet +aqs::logstash_host: logstash1001.eqiad.wmnet +aqs::cassandra_defaultConsistency: localOne +aqs::cassandra_localDc: "%{::site}" +aqs::statsd_host: statsd.eqiad.wmnet + diff --git a/hieradata/hosts/aqs1005 b/hieradata/hosts/aqs1005 new file mode 100644 index 0000000..09b37b2 --- /dev/null +++ b/hieradata/hosts/aqs1005 @@ -0,0 +1,30 @@ +# Analytics Query Service - Testing node + +cassandra::seeds: + - aqs1004.eqiad.wmnet + - aqs1005.eqiad.wmnet + - aqs1006.eqiad.wmnet + +cassandra::instances: + a: + jmx_port: 7189 + listen_address: 10.64.32.189 #aqs1005-a.eqiad.wmnet + rpc_address: 110.64.32.189 + rpc_interface: eth0 + b: + jmx_port: 7190 + listen_address: 10.64.32.190 #aqs1005-b.eqiad.wmnet + rpc_address: 10.64.32.190 + rpc_interface: eth0 + +# +# AQS service +# +aqs::seeds: + - aqs1004.eqiad.wmnet + - aqs1005.eqiad.wmnet + - aqs1006.eqiad.wmnet +aqs::logstash_host: logstash1001.eqiad.wmnet +aqs::cassandra_defaultConsistency: localOne +aqs::cassandra_localDc: "%{::site}" +aqs::statsd_host: statsd.eqiad.wmnet diff --git a/hieradata/hosts/aqs1006 b/hieradata/hosts/aqs1006 new file mode 100644 index 0000000..76fa555 --- /dev/null +++ b/hieradata/hosts/aqs1006 @@ -0,0 +1,30 @@ +# Analytics Query Service - Testing node + +cassandra::seeds: + - aqs1004.eqiad.wmnet + - aqs1005.eqiad.wmnet + - aqs1006.eqiad.wmnet + +cassandra::instances: + a: + jmx_port: 7189 + listen_address: 10.64.48.148 #aqs1006-a.eqiad.wmnet + rpc_address: 10.64.48.148 + rpc_interface: eth0 + b: + jmx_port: 7190 + listen_address: 10.64.48.149 #aqs1006-b.eqiad.wmnet + rpc_address: 10.64.48.149 + rpc_interface: eth0 + +# +# AQS service +# +aqs::seeds: + - aqs1004.eqiad.wmnet + - aqs1005.eqiad.wmnet + - aqs1006.eqiad.wmnet +aqs::logstash_host: logstash1001.eqiad.wmnet +aqs::cassandra_defaultConsistency: localOne +aqs::cassandra_localDc: "%{::site}" +aqs::statsd_host: statsd.eqiad.wmnet diff --git a/manifests/site.pp b/manifests/site.pp index 69cac89..cd2bbbb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -136,6 +136,14 @@ role aqs } +# Analytics Query Service - Testing +# These nodes are not part of the official AQS cluster now because we are +# currently testing Cassandra configurations on top of them. Hiera variables +# have been placed for each host to override the role's default values. +node /aqs100[456]\.eqiad\.wmnet/ { + role aqs +} + # git.wikimedia.org node 'antimony.wikimedia.org' { -- To view, visit https://gerrit.wikimedia.org/r/288373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I504a9536c28ee839ea9a11f2f5950f0742bb94b0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <ltosc...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits