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

Merge pull request #1517 from baijum/sprint

Browse Source 
Fix various issues with `is_replication_enabled`
This commit is contained in:
Thomas S Hatch 2012-06-30 10:12:21 -07:00
commit 8f8597d91f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/solr.py
View File

@ -632,7 +632,7 @@ def is_replication_enabled(host=None, core_name=None):
ret = _get_return_dict()
success = True
# since only slaves can call this let's check the config:
if self._is_master() and is_none(host) is None:
if _is_master() and host is None:
errors = ['Only "slave" minions can run "is_replication_enabled"']
return ret.update({'success': False, 'errors': errors})
@ -642,7 +642,7 @@ def is_replication_enabled(host=None, core_name=None):
slave = resp['data']['details']['slave']
# we need to initialize this to false in case there is an error
# on the master and we can't get this info.
replication_enabled = 'false'
enabled = 'false'
master_url = slave['masterUrl']
#check for errors on the slave
if 'ERROR' in slave: