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

Keep track of recursive nodegroup_comp calls, keep list format if it's recursing

Browse source
This commit is contained in:
Colton Myers 2015-10-20 14:39:32 -06:00
parent 155634a0aa
commit 036d767a98
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/minions.py
View file

@ -100,7 +100,7 @@ def get_minion_data(minion, opts):
return minion if minion else None, None, None
def nodegroup_comp(nodegroup, nodegroups, skip=None):
def nodegroup_comp(nodegroup, nodegroups, skip=None, first_call=True):
'''
Recursively expand ``nodegroup`` from ``nodegroups``; ignore nodegroups in ``skip``
'''
@ -135,7 +135,7 @@ def nodegroup_comp(nodegroup, nodegroups, skip=None):
ret.append(word)
elif len(word) >= 3 and word.startswith('N@'):
expanded_nodegroup = True
ret.extend(nodegroup_comp(word[2:], nodegroups, skip=skip))
ret.extend(nodegroup_comp(word[2:], nodegroups, skip=skip, first_call=False))
else:
ret.append(word)
@ -148,9 +148,12 @@ def nodegroup_comp(nodegroup, nodegroups, skip=None):
log.debug('nodegroup_comp({0}) => {1}'.format(nodegroup, ret))
# Only return list form if a nodegroup was expanded. Otherwise return
# the original string to conserve backwards compat
if expanded_nodegroup:
if expanded_nodegroup or not first_call:
return ret
else:
log.debug('No nested nodegroups detected. '
'Using original nodegroup definition: {0}'
.format(nodegroups[nodegroup]))
return nodegroups[nodegroup]