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

Merge pull request #8865 from maxchk/facter-load-puppet-libraries

Browse Source 
Facter load puppet libraries
This commit is contained in:
Thomas S Hatch 2013-11-27 22:09:52 -08:00
commit d1811836e7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/puppet.py
View File

@ -166,7 +166,7 @@ def noop(*args, **kwargs):
return run(*args, **kwargs)
def facts():
def facts(puppet=False):
'''
Run facter and return the results
@ -179,7 +179,8 @@ def facts():
_check_facter()
ret = {}
output = __salt__['cmd.run']('facter')
opt_puppet = '--puppet' if puppet else ''
output = __salt__['cmd.run']('facter {0}'.format(opt_puppet))
# Loop over the facter output and properly
# parse it into a nice dictionary for using
@ -194,7 +195,7 @@ def facts():
return ret
def fact(name):
def fact(name, puppet=False):
'''
Run facter for a specific fact
@ -206,7 +207,8 @@ def fact(name):
'''
_check_facter()
ret = __salt__['cmd.run']('facter {0}'.format(name))
opt_puppet = '--puppet' if puppet else ''
ret = __salt__['cmd.run']('facter {0} {1}'.format(opt_puppet,name))
if not ret:
return ''
return ret