diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
commit | aa230853296cd3b69f0296d646daf37b4b2cd764 (patch) | |
tree | 8ad1a2e8ee5f05ef775c2536984440a0cc74ec78 /src/lib/Bcfg2/settings.py | |
parent | 08f5ad7e1b470b79ce81130b2f299426b132db80 (diff) | |
parent | 3435963a7c715bd3e6e912c6224fc8b893b1abe4 (diff) | |
download | bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.gz bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.bz2 bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.zip |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/appendix/guides/ubuntu.txt
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/settings.py
Diffstat (limited to 'src/lib/Bcfg2/settings.py')
-rw-r--r-- | src/lib/Bcfg2/settings.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index d73ab7c56..13512ff58 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -50,8 +50,8 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None): """ read the config file and set django settings based on it """ # pylint: disable=W0602,W0603 global DATABASE_ENGINE, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, \ - DATABASE_HOST, DATABASE_PORT, DATABASE_OPTIONS, DEBUG, \ - TEMPLATE_DEBUG, TIME_ZONE, MEDIA_URL + DATABASE_HOST, DATABASE_PORT, DATABASE_OPTIONS, DATABASE_SCHEMA, \ + DEBUG, TEMPLATE_DEBUG, TIME_ZONE, MEDIA_URL # pylint: enable=W0602,W0603 if not os.path.exists(cfile) and os.path.exists(DEFAULT_CONFIG): @@ -79,7 +79,8 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None): PASSWORD=setup['db_password'], HOST=setup['db_host'], PORT=setup['db_port'], - OPTIONS=setup['db_options']) + OPTIONS=setup['db_options'], + SCHEMA=setup['db_schema']) # dropping the version check. This was added in 1.1.2 TIME_ZONE = setup['time_zone'] |