Filippo Giunchedi has submitted this change and it was merged. Change subject: restbase: provision restbase/cassandra role ......................................................................
restbase: provision restbase/cassandra role provision the cassandra/restbase role on production hosts and change the seed list accordingly. Also switch the test cluster to keep the same seed list as before. Bug: T76986 Change-Id: Ic34336ace248942a8d65f2c2a0bcf5b36176b770 --- M hieradata/regex.yaml M hieradata/role/common/restbase.yaml M manifests/site.pp 3 files changed, 29 insertions(+), 8 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Alexandros Kosiaris: Looks good to me, approved diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index d47e33d..ec47904 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -19,3 +19,13 @@ admin::groups: - wikidata-query-roots +cassandra_test: + __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ + cassandra::seeds: + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet + - xenon.eqiad.wmnet + restbase::seeds: + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet + - xenon.eqiad.wmnet diff --git a/hieradata/role/common/restbase.yaml b/hieradata/role/common/restbase.yaml index 4f71c74..78cd234 100644 --- a/hieradata/role/common/restbase.yaml +++ b/hieradata/role/common/restbase.yaml @@ -1,12 +1,13 @@ # TODO: set up a cluster variable similar to MySQL clusters to share # cassandra cluster configs between cassandra & clients -# -# Cassandra test cluster for RESTBase cassandra::seeds: - - xenon.eqiad.wmnet - - cerium.eqiad.wmnet - - praseodymium.eqiad.wmnet + - restbase1001.eqiad.wmnet + - restbase1002.eqiad.wmnet + - restbase1003.eqiad.wmnet + - restbase1004.eqiad.wmnet + - restbase1005.eqiad.wmnet + - restbase1006.eqiad.wmnet cassandra::max_heap_size: 8g cassandra::heap_newsize: 1200m @@ -14,9 +15,12 @@ # RESTBase # restbase::seeds: - - xenon.eqiad.wmnet - - cerium.eqiad.wmnet - - praseodymium.eqiad.wmnet + - restbase1001.eqiad.wmnet + - restbase1002.eqiad.wmnet + - restbase1003.eqiad.wmnet + - restbase1004.eqiad.wmnet + - restbase1005.eqiad.wmnet + - restbase1006.eqiad.wmnet restbase::logstash_host: logstash1002.eqiad.wmnet restbase::cassandra_defaultConsistency: localQuorum restbase::statsd_host: statsd.eqiad.wmnet diff --git a/manifests/site.pp b/manifests/site.pp index c226390..04c0eae 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1741,6 +1741,13 @@ } } +# restbase eqiad cluster +node /^restbase100[1-6]\.eqiad\.wmnet$/ { + role restbase, cassandra + include standard + include admin +} + node 'rubidium.wikimedia.org' { interface::add_ip6_mapped { 'main': interface => 'eth0', -- To view, visit https://gerrit.wikimedia.org/r/190426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic34336ace248942a8d65f2c2a0bcf5b36176b770 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits