valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40239 from saltstack/revert-40225-waitforfun

Browse Source 
Revert "Add wait_for_fun() to set_tags()"
This commit is contained in:
Mike Place 2017-03-22 16:59:15 -06:00 committed by GitHub
commit e39f5cbf40
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/cloud/clouds/ec2.py
View File

@ -2567,11 +2567,7 @@ def create(vm_=None, call=None):
transport=__opts__['transport']
)
# Sometimes it takes a little longer than expected to set the tags, so
# let's give it a few tries
salt.utils.cloud.wait_for_fun(
set_tags,
timeout=30,
set_tags(
vm_['name'],
tags,
instance_id=vm_['instance_id'],