GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/175939
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. Change-Id: I8d157b5757df898e16172ec88e657edf6c132a9c --- M hieradata/eqiad.yaml M hieradata/regex.yaml 2 files changed, 22 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/175939/1 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/regex.yaml b/hieradata/regex.yaml index 2df9e30..b44a385 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -114,3 +114,25 @@ rcs_eqiad: __regex: !ruby/regexp /^rcs100[0-9]\.eqiad\.wmnet/ cluster: rcstream + +restbase_eqiad: + __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ + # 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 -- To view, visit https://gerrit.wikimedia.org/r/175939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d157b5757df898e16172ec88e657edf6c132a9c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
