From 2f7b00a52b304a1db7fbfdfceafbd45217e29e9a Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Wed, 10 Oct 2012 08:07:25 -0500 Subject: Reporting: Make transport configurable Add routines to the setup to handle alternate transports. Make the default for new installs LocalFilesystem and existing installs DirectStore. Raise an error is DirectStore is used when loading bcfg-report-collector --- src/lib/Bcfg2/Options.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Options.py') diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index 467d9d6d7..4dd3dd3f7 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -634,6 +634,12 @@ REPORTING_FILE_LIMIT = \ cf=('reporting', 'file_limit'), cook=get_size,) +# Reporting options +REPORTING_TRANSPORT = \ + Option('Reporting transport', + default='DirectStore', + cf=('reporting', 'transport'),) + # Client options CLIENT_KEY = \ Option('Path to SSL key', @@ -1161,7 +1167,8 @@ DATABASE_COMMON_OPTIONS = dict(web_configfile=WEB_CFILE, django_debug=DJANGO_DEBUG, web_prefix=DJANGO_WEB_PREFIX) -REPORTING_COMMON_OPTIONS = dict(reporting_file_limit=REPORTING_FILE_LIMIT) +REPORTING_COMMON_OPTIONS = dict(reporting_file_limit=REPORTING_FILE_LIMIT, + reporting_transport=REPORTING_TRANSPORT) class OptionParser(OptionSet): -- cgit v1.2.3-1-g7c22