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

Fix cassandra module. __salt__ doesn't exist yet

Browse Source
This commit is contained in:
David Boucha 2013-01-28 14:39:04 -07:00
parent b2c835bb7a
commit 2835937016
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/modules/cassandra.py
View File

@ -18,20 +18,10 @@ log = logging.getLogger(__name__)
HAS_PYCASSA = False
try:
from pycassa.system_manager import SystemManager
# Verify that Cassandra and nodetool are actually installed
nodetool = __salt__['config.option']('cassandra.nodetool')
host = __salt__['config.option']('cassandra.host')
thrift_port = str(__salt__['config.option']('cassandra.THRIFT_PORT'))
HAS_PYCASSA = True
except ImportError:
pass
NT = ''
HOST = ''
THRIFT_PORT = ''
def __virtual__():
'''
@ -40,7 +30,7 @@ def __virtual__():
if not HAS_PYCASSA:
return False
if nodetool and host and thrift_port:
if HAS_PYCASSA and salt.utils.which('nodetool'):
return 'cassandra'
return False
@ -50,14 +40,18 @@ def _nodetool(cmd):
Internal cassandra nodetool wrapper. Some functions are not
available via pycassa so we must rely on nodetool.
'''
return __salt__['cmd.run_stdout']('{0} -h {1} {2}'.format(NT, HOST, cmd))
nodetool = __salt__['config.option']('cassandra.nodetool')
host = __salt__['config.option']('cassandra.host')
return __salt__['cmd.run_stdout']('{0} -h {1} {2}'.format(nodetool, host, cmd))
def _sys_mgr():
'''
Return a pycassa system manager connection object
'''
return SystemManager('{0}:{1}'.format(HOST, THRIFT_PORT))
thrift_port = str(__salt__['config.option']('cassandra.THRIFT_PORT'))
host = __salt__['config.option']('cassandra.host')
return SystemManager('{0}:{1}'.format(host, thrift_port))
def compactionstats():