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

Add glob and regex support for determining if the minion should run

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-09 12:50:32 -07:00
parent e400609e0f
commit 765b43ea87
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/minion.py
View file

@ -6,6 +6,7 @@ import os
import distutils.sysconfig
import importlib
import re
import tempfile
# Import zeromq libs
import zmq
@ -93,8 +94,12 @@ class Minion(object):
or not data.has_key('arg'):
return ret
# Verify that the publication applies to this minion
if not re.match(data['tgt'], self.opts['hostname']):
return ret
if data.has_key('tgt_type'):
if not apply(self, '_' + data['tgt_type'] + 'match', data['tgt']):
return ret
else:
if not self._glob_match(data['tgt']):
return ret
if self.functions.has_key(data['fun']):
ret['return'] = apply(self.functions[data['fun']], data['arg'])
@ -113,6 +118,23 @@ class Minion(object):
'''
pass
def _glob_match(self, tgt):
'''
Returns true if the passed glob matches the hostname
'''
tmp_dir = tempfile.mkdtemp()
cwd = os.getcwd()
os.chdir(tmp_dir)
open(self.opts['hostname'], 'w+').write('salt')
ret = bool(glob.glob(tgt))
os.chdir(cwd)
return ret
def _pcre_match(self, tgt):
'''
Returns true if the passed pcre regex matches
'''
return bool(re.match(tgt, self.opts['hostname']))
def _return_pub(self, ret):
'''