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

clean up and add some minor logging

Browse Source 
make --roster-file work with the ansible roster
This commit is contained in:
Daniel Wallace 2014-07-23 19:22:49 -05:00 committed by Colton Myers
parent ecaf3e7716
commit f1261343f4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/roster/__init__.py
View File

@ -9,6 +9,9 @@ systems that cannot or should not host a minion agent.
# Import salt libs
import salt.loader
import logging
log = logging.getLogger(__name__)
class Roster(object):
'''
@ -45,5 +48,8 @@ class Roster(object):
f_str = '{0}.targets'.format(back)
if f_str not in self.rosters:
continue
try:
targets.update(self.rosters[f_str](tgt, tgt_type))
except salt.exceptions.SaltRenderError as exc:
log.debug('Unable to render roster file: {0}'.format(exc.error))
return targets

12
salt/roster/ansible.py
View File

@ -26,9 +26,9 @@ def targets(tgt, tgt_type='glob', **kwargs):
Default: /etc/salt/hosts
'''
if tgt == 'all':
tgt = '*':
if __opts__.get('inventory_file', False) is not False:
hosts = __opts__.get('inventory_file')
tgt = '*'
if __opts__.get('roster_file', False) is not False:
hosts = __opts__.get('roster_file')
elif os.path.isfile(__opts__['conf_file']) or not os.path.exists(__opts__['conf_file']):
hosts = os.path.join(
os.path.dirname(__opts__['conf_file']),
@ -37,7 +37,7 @@ def targets(tgt, tgt_type='glob', **kwargs):
hosts = os.path.join(__opts__['conf_file'], 'hosts')
if os.path.isfile(hosts) and os.access(hosts, os.X_OK):
imatcher = Script(tgt, tgt_type='glob', hosts=hosts)
imatcher = Script(tgt, tgt_type='glob', inventory_file=hosts)
else:
imatcher = Inventory(tgt, tgt_type='glob', inventory_file=hosts)
return imatcher.targets()
@ -56,7 +56,7 @@ class Inventory(object):
blocks = re.compile('^\[.*\]$')
hostvar = re.compile('^\[([^:]+):vars\]$')
parents = re.compile('^\[([^:]+):children\]$')
with salt.utils.fopen(hosts) as config:
with salt.utils.fopen(inventory_file) as config:
for line in config.read().split('\n'):
if not line or line.startswith('#'):
continue
@ -150,7 +150,7 @@ class Script(Inventory):
'''
Matcher for Inventory scripts
'''
def __init__(self, inventory_file='/etc/salt/hosts2'):
def __init__(self, tgt, tgt_type='glob', inventory_file='/etc/salt/hosts'):
self.tgt = tgt
self.tgt_type = tgt_type
inventory, error = subprocess.Popen([inventory_file], shell=True, stdout=subprocess.PIPE).communicate()