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 #39624 from drawsmcgraw/39622

Browse source 
Address issue 39622
This commit is contained in:
Mike Place 2017-03-03 08:59:03 -07:00 • committed by GitHub
commit f575ef459f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/boto_vpc.py
View file

@ -2199,7 +2199,13 @@ def _maybe_set_name_tag(name, obj):
def _maybe_set_tags(tags, obj):
if tags:
obj.add_tags(tags)
# Not all objects in Boto have an 'add_tags()' method.
try:
obj.add_tags(tags)
except AttributeError:
for tag, value in tags.items():
obj.add_tag(tag, value)
log.debug('The following tags: {0} were added to {1}'.format(', '.join(tags), obj))