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

Merge pull request #26793 from rallytime/fix-name-stacktrace

Browse source 
Don't stacktrace if "name" is specified as a minion id in a map file
This commit is contained in:
Joseph Hall 2015-08-31 13:24:25 -06:00
commit da161b9516
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/cloud/__init__.py
View file

@ -1696,7 +1696,15 @@ class Map(Cloud):
# - bar1:
# - bar2:
overrides = {}
overrides.setdefault('name', name)
try:
overrides.setdefault('name', name)
except AttributeError:
log.error(
'Cannot use \'name\' as a minion id in a cloud map as it '
'is a reserved word. Please change \'name\' to a different '
'minion id reference.'
)
return ''
entries[name] = overrides
map_[profile] = entries
continue