valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move mysql module to use new config.option function

Browse Source
This commit is contained in:
Thomas S Hatch 2012-11-01 16:59:54 -06:00
parent ae5e5daca2
commit 464f3a2867
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/modules/mysql.py
View File

@ -42,12 +42,8 @@ def __virtual__():
'''
Only load this module if the mysql config is set
'''
if any(k.startswith('mysql.') for k in list(__opts__)):
if has_mysqldb:
return 'mysql'
elif any(k.startswith('mysql.') for k in list(__pillar__)):
if has_mysqldb:
return 'mysql'
if __salt__['config.dot_key']('mysql') and has_mysqldb:
return 'mysql'
return False
@ -100,10 +96,8 @@ def connect(**kwargs):
key = name
if name in kwargs:
connargs[key] = kwargs[name]
elif 'mysql.{0}'.format(name) in __opts__:
connargs[key] = __opts__['mysql.{0}'.format(name)]
elif 'mysql.{0}'.format(name) in __pillar__:
connargs[key] = __pillar__['mysql.{0}'.format(name)]
else:
connargs[key] = __salt__['config.option']('mysql.{0}'.format(name))
_connarg('host')
_connarg('user')