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

Things I broke in getting facter adn clustering integrated

Browse Source
This commit is contained in:
Thomas S Hatch 2011-03-21 22:38:54 -06:00
parent fb8945a325
commit 678788a4ab
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/config.py
View File

@ -5,6 +5,7 @@ All salt configuration loading and defaults should be in this module
import os
import sys
import socket
import subprocess
# Import third party libs
import yaml
# Import salt libs

4
salt/minion.py
View File

@ -48,7 +48,7 @@ class Minion(object):
# functionality.
mods = set()
# Load up the facter information
functions = {}
mod_dir = os.path.join(distutils.sysconfig.get_python_lib(),
'salt/modules')
for fn_ in os.listdir(mod_dir):
@ -170,7 +170,7 @@ class Minion(object):
Reads in the facter regular expresion match
'''
comps = tgt.split()
return bool(re.match(comps[1], self.opts['facter'][comps[0]])
return bool(re.match(comps[1], self.opts['facter'][comps[0]]))
def _return_pub(self, ret):
'''