summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options.py
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2012-10-10 08:07:25 -0500
committerTim Laszlo <tim.laszlo@gmail.com>2012-10-10 08:07:25 -0500
commit2f7b00a52b304a1db7fbfdfceafbd45217e29e9a (patch)
treef53eaf458ebbea87f4b333a82862e3cc0d6afdcf /src/lib/Bcfg2/Options.py
parent54f1fd380fb005dbe37237cbb3e085340539bc3b (diff)
downloadbcfg2-2f7b00a52b304a1db7fbfdfceafbd45217e29e9a.tar.gz
bcfg2-2f7b00a52b304a1db7fbfdfceafbd45217e29e9a.tar.bz2
bcfg2-2f7b00a52b304a1db7fbfdfceafbd45217e29e9a.zip
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
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
-rw-r--r--src/lib/Bcfg2/Options.py9
1 files changed, 8 insertions, 1 deletions
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):