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 #26271 from rallytime/fix-24483

Browse source 
Fix del_root_vol_on_destroy and del_all_vols_on_destroy functionality on ec2
This commit is contained in:
Joseph Hall 2015-08-12 17:22:47 -06:00
commit 10af22775a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/cloud/clouds/ec2.py
View file

@ -1600,7 +1600,6 @@ def request_instance(vm_=None, call=None):
}
try:
rd_data = aws.query(rd_params,
return_root=True,
location=get_location(),
provider=get_provider(),
opts=__opts__,
@ -2294,7 +2293,7 @@ def create(vm_=None, call=None):
'volumes': volumes,
'zone': ret['placement']['availabilityZone'],
'instance_id': ret['instanceId'],
'del_all_vols_on_destroy': vm_.get('set_del_all_vols_on_destroy', False)
'del_all_vols_on_destroy': vm_.get('del_all_vols_on_destroy', False)
},
call='action'
)