diff options
author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-23 17:04:20 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-23 17:26:13 +0200 |
commit | f733133c835193a884edcf34e5daff6365745d21 (patch) | |
tree | c43aa445f574bb1e15843b00388914f5f7c0b9b7 /src/lib/Bcfg2/DBSettings.py | |
parent | c7e67299381df961ff8274e9b53827c2bddbb47b (diff) | |
download | bcfg2-f733133c835193a884edcf34e5daff6365745d21.tar.gz bcfg2-f733133c835193a884edcf34e5daff6365745d21.tar.bz2 bcfg2-f733133c835193a884edcf34e5daff6365745d21.zip |
Options/Types: Fix database OPTIONS parsing
This is mostly from 257eb0c17 and 16d3e04cb to allow for setting arbitrary
database options since some settings require nested dictionaries, etc.
This got lost during merge from maint into master because of the completely
different Options parsing.
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
-rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 5a83c25c3..1c8c34978 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -229,7 +229,7 @@ class _OptionContainer(object): dest='db_schema', default='public'), Bcfg2.Options.Option( cf=('database', 'options'), help='Database options', - dest='db_opts', type=Bcfg2.Options.Types.comma_dict, + dest='db_opts', type=Bcfg2.Options.Types.literal_dict, default=dict()), # reporting database options Bcfg2.Options.Option( @@ -258,7 +258,7 @@ class _OptionContainer(object): Bcfg2.Options.Option( cf=('database', 'reporting_options'), help='Reporting database options', dest='reporting_db_opts', - type=Bcfg2.Options.Types.comma_dict, default=dict()), + type=Bcfg2.Options.Types.literal_dict, default=dict()), # Django options Bcfg2.Options.Option( cf=('reporting', 'time_zone'), help='Django timezone'), |