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

Rename ssh_nodegroups to ssh_list_nodegroups

Browse source
This commit is contained in:
Colton Myers 2015-11-18 13:09:29 -07:00
parent bd8487b3b9
commit 6433abf36f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/config.py
View file

@ -591,7 +591,7 @@ VALID_OPTS = {
# List-only nodegroups for salt-ssh. Each group must be formed as either a
# comma-separated list, or a YAML list.
'ssh_nodegroups': dict,
'ssh_list_nodegroups': dict,
# The logfile location for salt-key
'key_logfile': str,
@ -1116,7 +1116,7 @@ DEFAULT_MASTER_OPTS = {
'search_index_interval': 3600,
'loop_interval': 60,
'nodegroups': {},
'ssh_nodegroups': {},
'ssh_list_nodegroups': {},
'cython_enable': False,
'enable_gpu_grains': False,
# XXX: Remove 'key_logfile' support in 2014.1.0

4
salt/roster/flat.py
View file

@ -94,10 +94,10 @@ class RosterMatcher(object):
def ret_nodegroup_minions(self):
'''
Return minions which match the special list-only groups defined by
ssh_nodegroups
ssh_list_nodegroups
'''
minions = {}
nodegroup = __opts__.get('ssh_nodegroups', {}).get(self.tgt, [])
nodegroup = __opts__.get('ssh_list_nodegroups', {}).get(self.tgt, [])
if not isinstance(nodegroup, list):
nodegroup = nodegroup.split(',')
for minion in self.raw: