diff options
Diffstat (limited to 'src/lib/Bcfg2/settings.py')
| -rw-r--r-- | src/lib/Bcfg2/settings.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index a26330a79..42d415232 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -18,14 +18,6 @@ except ImportError: DATABASES = dict(default=dict()) -# Django < 1.2 compat -DATABASE_ENGINE = None -DATABASE_NAME = None -DATABASE_USER = None -DATABASE_PASSWORD = None -DATABASE_HOST = None -DATABASE_PORT = None - TIME_ZONE = None TEMPLATE_DEBUG = DEBUG = False @@ -128,7 +120,9 @@ def read_config(): USER=Bcfg2.Options.setup.db_user, PASSWORD=Bcfg2.Options.setup.db_password, HOST=Bcfg2.Options.setup.db_host, - PORT=Bcfg2.Options.setup.db_port) + PORT=Bcfg2.Options.setup.db_port, + OPTIONS=Bcfg2.Options.setup.db_opts, + SCHEMA=Bcfg2.Options.setup.db_schema) TIME_ZONE = Bcfg2.Options.setup.timezone @@ -142,6 +136,8 @@ def read_config(): class _OptionContainer(object): + """ Container for options loaded at import-time to configure + databases """ options = [ Bcfg2.Options.Common.repository, Bcfg2.Options.PathOption( @@ -165,6 +161,12 @@ class _OptionContainer(object): Bcfg2.Options.Option( cf=('database', 'port'), help='Database port', dest='db_port'), Bcfg2.Options.Option( + cf=('database', 'schema'), help='Database schema', + dest='db_schema'), + Bcfg2.Options.Option( + cf=('database', 'options'), help='Database options', + dest='db_opts', type=Bcfg2.Options.Types.comma_dict), + Bcfg2.Options.Option( cf=('reporting', 'timezone'), help='Django timezone'), Bcfg2.Options.BooleanOption( cf=('reporting', 'web_debug'), help='Django debug'), |