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 #9727 from basepi/minion_id_clarification

Browse Source 
Clarify caching location for minion_id
This commit is contained in:
Erik Johnson 2014-01-13 16:36:28 -08:00
commit 5df8db8ce4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/config.py
View File

@ -1645,7 +1645,8 @@ def get_id(root_dir=None, minion_id=False, cache=True):
with salt.utils.fopen(id_cache) as idf:
name = idf.read().strip()
if name:
log.info('Using cached minion ID: {0}'.format(name))
log.info('Using cached minion ID from {0}: {1}'
.format(id_cache, name))
return name, False
except (IOError, OSError):
pass