adding 'encrypted' option into volume dict so ec2 module can easily include encrypted volumes

pull/18777/head
Philip Kirkland 10 years ago committed by Matt Clay
parent 88ae201b20
commit cc214afed6

@ -197,7 +197,7 @@ options:
volumes: volumes:
version_added: "1.5" version_added: "1.5"
description: description:
- a list of volume dicts, each containing device name and optionally ephemeral id or snapshot id. Size and type (and number of iops for io device type) must be specified for a new volume or a root volume, and may be passed for a snapshot volume. For any volume, a volume size less than 1 will be interpreted as a request not to create the volume. - a list of volume dicts, each containing device name and optionally ephemeral id or snapshot id. Size and type (and number of iops for io device type) must be specified for a new volume or a root volume, and may be passed for a snapshot volume. For any volume, a volume size less than 1 will be interpreted as a request not to create the volume. Encrypt the volume by passing 'encrypted: true' in the volume dict.
required: false required: false
default: null default: null
aliases: [] aliases: []
@ -668,7 +668,8 @@ def create_block_device(module, ec2, volume):
size=volume.get('volume_size'), size=volume.get('volume_size'),
volume_type=volume.get('device_type'), volume_type=volume.get('device_type'),
delete_on_termination=volume.get('delete_on_termination', False), delete_on_termination=volume.get('delete_on_termination', False),
iops=volume.get('iops')) iops=volume.get('iops'),
encrypted=volume.get('encrypted', False))
def boto_supports_param_in_spot_request(ec2, param): def boto_supports_param_in_spot_request(ec2, param):
""" """

Loading…
Cancel
Save