From 15bfca95fc4e5eb26dce864843b460ce32c32c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Lu=CC=88dicke?= Date: Wed, 4 Jan 2017 16:07:13 +0100 Subject: [PATCH] build remaining default attributes with reference to node instead of default filestore_options location and celery_beat_schedule_filename Without this a wrapper cookbook that sets another default filestore_dir has to modify the filestore_options hash too --- attributes/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 882e177..474e10b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -104,7 +104,7 @@ default["sentry"]["config"]["broker_url"] = "redis://localhost:6379" default["sentry"]["config"]["celeryd_concurrency"] = 1 default["sentry"]["config"]["celery_send_events"] = false -default["sentry"]["config"]["celerybeat_schedule_filename"] = "#{default["sentry"]["filestore_dir"]}/celery_beat_schedule" +default["sentry"]["config"]["celerybeat_schedule_filename"] = "#{node["sentry"]["filestore_dir"]}/celery_beat_schedule" #digests config default["sentry"]["config"]["digests"] = 'sentry.digests.backends.redis.RedisBackend' default["sentry"]["config"]["ratelimiter"] = "sentry.ratelimits.redis.RedisRateLimiter" @@ -113,7 +113,7 @@ default["sentry"]["config"]["tsdb"] = "sentry.tsdb.redis.RedisTSDB" # Filestore config default["sentry"]["config"]["filestore"] = "django.core.files.storage.FileSystemStorage" -default["sentry"]["config"]["filestore_options"]["location"] = default["sentry"]["filestore_dir"] +default["sentry"]["config"]["filestore_options"]["location"] = node["sentry"]["filestore_dir"] # data sampling default["sentry"]["config"]["sample_data"] = false