Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Move restbase config to regex.yaml ......................................................................
Move restbase config to regex.yaml This targets the restbase and cassandra config to the test hosts, and should work with the new hiera setup as per https://gerrit.wikimedia.org/r/#/c/174694/ and https://wikitech.wikimedia.org/wiki/Puppet_Hiera#Practical_example. Bug: T1228 Change-Id: I8d157b5757df898e16172ec88e657edf6c132a9c --- M hieradata/eqiad.yaml A hieradata/mainrole/restbase.yaml M hieradata/regex.yaml 3 files changed, 23 insertions(+), 19 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved GWicke: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 61b2143..ab0dd5a 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -16,22 +16,3 @@ - '10.64.0.194:11211:1' - '10.64.0.195:11211:1' -# -# Cassandra test cluster for RESTBase -cassandra::seeds: - - xenon.eqiad.wmnet - - cerium.eqiad.wmnet - - praseodymium.eqiad.wmnet - -# -# RESTBase -# -# TODO: figure out a way to reference a cassandra cluster definition (see -# above) directly without repeating it -# -restbase::seeds: - - xenon.eqiad.wmnet - - cerium.eqiad.wmnet - - praseodymium.eqiad.wmnet -restbase::logstash_host: logstash1002.eqiad.wmnet -restbase::cassandra_defaultConsistency: localQuorum diff --git a/hieradata/mainrole/restbase.yaml b/hieradata/mainrole/restbase.yaml new file mode 100644 index 0000000..11ea3cc --- /dev/null +++ b/hieradata/mainrole/restbase.yaml @@ -0,0 +1,19 @@ +# 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 + +# +# RESTBase +# +restbase::seeds: + - xenon.eqiad.wmnet + - cerium.eqiad.wmnet + - praseodymium.eqiad.wmnet +restbase::logstash_host: logstash1002.eqiad.wmnet +restbase::cassandra_defaultConsistency: localQuorum diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 2df9e30..0fa309f 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -114,3 +114,7 @@ rcs_eqiad: __regex: !ruby/regexp /^rcs100[0-9]\.eqiad\.wmnet/ cluster: rcstream + +restbase_eqiad: + __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ + mainrole: restbase -- To view, visit https://gerrit.wikimedia.org/r/175939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d157b5757df898e16172ec88e657edf6c132a9c Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Gage <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Mark Bergsma <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
