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

Merge pull request #18946 from walgitrus/ec2-encrypted-ebs

Browse Source 
Recognize `encrypted` keyword for ec2 volumes
This commit is contained in:
Joseph Hall 2014-12-11 19:13:02 -07:00
commit 5ab0cdb6a6
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/cloud/clouds/ec2.py
View File

@ -2302,6 +2302,8 @@ def create_attach_volumes(name, kwargs, call=None, wait_to_finish=True):
volume_dict['type'] = volume['type'] volume_dict['type'] = volume['type']
if 'iops' in volume: if 'iops' in volume:
volume_dict['iops'] = volume['iops'] volume_dict['iops'] = volume['iops']
if 'encrypted' in volume:
volume_dict['encrypted'] = volume['encrypted']
if 'volume_id' not in volume_dict: if 'volume_id' not in volume_dict:
created_volume = create_volume(volume_dict, call='function', wait_to_finish=wait_to_finish) created_volume = create_volume(volume_dict, call='function', wait_to_finish=wait_to_finish)
@ -3336,6 +3338,9 @@ def create_volume(kwargs=None, call=None, wait_to_finish=False):
if 'iops' in kwargs and kwargs.get('type', 'standard') == 'io1': if 'iops' in kwargs and kwargs.get('type', 'standard') == 'io1':
params['Iops'] = kwargs['iops'] params['Iops'] = kwargs['iops']
if 'encrypted' in kwargs:
params['Encrypted'] = kwargs['encrypted']
log.debug(params) log.debug(params)
data = aws.query(params, data = aws.query(params,