saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29743 from akissa/fix-pillar-sqlite3-does-not-honour-config

Browse source 
fix pillar sqlite not honouring config options
This commit is contained in:
Mike Place 2015-12-16 07:40:27 -07:00
commit e977096409
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/pillar/sqlite3.py
View file

@ -79,6 +79,11 @@ class SQLite3ExtPillar(SqlBaseExtPillar):
'timeout': 5.0}
_options = {}
_opts = __opts__.get('pillar', {}).get('sqlite3', {})
if 'database' not in _opts:
_sqlite3_opts = __opts__.get('pillar', {}).get('master', {})\
.get('pillar', {}).get('sqlite3')
if _sqlite3_opts is not None:
_opts = _sqlite3_opts
for attr in defaults:
if attr not in _opts:
log.debug('Using default for SQLite3 pillar {0}'.format(attr))