Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/385332 )
Change subject: profile::aqs: specify the cassandra_local_dc parameter via hiera ...................................................................... profile::aqs: specify the cassandra_local_dc parameter via hiera This is useful when creating or working with existing cassandra clusters (like in labs) with datacenter names different from ::site. Change-Id: Id3d1d353cfb7084453512e84342219c910186921 --- M hieradata/role/common/aqs.yaml M modules/profile/manifests/aqs.pp 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/385332/1 diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml index 3447b83..cdbc74a 100644 --- a/hieradata/role/common/aqs.yaml +++ b/hieradata/role/common/aqs.yaml @@ -106,6 +106,7 @@ - aqs1009-b.eqiad.wmnet profile::aqs::logstash_host: logstash.svc.eqiad.wmnet profile::aqs::cassandra_default_consistency: localOne +profile::aqs::cassandra_local_dc: "%{::site}" profile::aqs::statsd_host: statsd.eqiad.wmnet role::lvs::realserver::pools: diff --git a/modules/profile/manifests/aqs.pp b/modules/profile/manifests/aqs.pp index 8cc3115..749560b 100644 --- a/modules/profile/manifests/aqs.pp +++ b/modules/profile/manifests/aqs.pp @@ -10,6 +10,7 @@ $cassandra_seeds = hiera('profile::aqs::seeds'), $logstash_host = hiera('profile::aqs::logstash_host'), $cassandra_default_consistency = hiera('profile::aqs::cassandra_default_consistency'), + $cassandra_local_dc = hiera('profile::aqs::cassandra_local_dc'), $statsd_host = hiera('profile::aqs::statsd_host'), ){ @@ -20,7 +21,7 @@ druid_query_path => $druid_query_path, seeds => $cassandra_seeds, cassandra_default_consistency => $cassandra_default_consistency, - cassandra_local_dc => $::site, + cassandra_local_dc => $cassandra_local_dc, statsd_host => $statsd_host, logstash_host => $logstash_host, } -- To view, visit https://gerrit.wikimedia.org/r/385332 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3d1d353cfb7084453512e84342219c910186921 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