valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15254 from saltstack/bp-15030

Browse Source 
Backport #15030 to 2014.7
This commit is contained in:
Thomas S Hatch 2014-08-26 13:28:46 -06:00
commit 5595b10661
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/boto_asg.py
View File

@ -120,6 +120,11 @@ def get_config(name, region=None, key=None, keyid=None, profile=None):
_tag['propagate_at_launch'] = tag.propagate_at_launch _tag['propagate_at_launch'] = tag.propagate_at_launch
_tags.append(_tag) _tags.append(_tag)
ret['tags'] = _tags ret['tags'] = _tags
# Boto accepts a string or list as input for vpc_zone_identifier,
# but always returns a comma separated list. We require lists in
# states.
elif attr == 'vpc_zone_identifier':
ret[attr] = getattr(asg, attr).split(',')
# convert SuspendedProcess objects to names # convert SuspendedProcess objects to names
elif attr == 'suspended_processes': elif attr == 'suspended_processes':
suspended_processes = getattr(asg, attr) suspended_processes = getattr(asg, attr)