Merge branch 'add-missing-param-lxc-proxmox-driver' of github.com:cavepopo/salt into add-missing-param-lxc-proxmox-driver

This commit is contained in:
pierre.bellicini 2017-10-06 10:34:17 +02:00
commit 6d36a9f9fa
No known key found for this signature in database
GPG Key ID: 2E46E1D241BA861C

View File

@ -122,6 +122,7 @@ def present(
kernel_id=None,
ramdisk_id=None,
block_device_mappings=None,
delete_on_termination=None,
instance_monitoring=False,
spot_price=None,
instance_profile_name=None,
@ -186,8 +187,10 @@ def present(
Default is standard.
delete_on_termination
Indicates whether to delete the volume on instance termination (true) or
not (false).
Whether the volume should be explicitly marked for deletion when its instance is
terminated (True), or left around (False). If not provided, or None is explicitly passed,
the default AWS behaviour is used, which is True for ROOT volumes of instances, and
False for all others.
iops
For Provisioned IOPS (SSD) volumes only. The number of I/O operations per
@ -268,6 +271,7 @@ def present(
kernel_id=kernel_id,
ramdisk_id=ramdisk_id,
block_device_mappings=block_device_mappings,
delete_on_termination=delete_on_termination,
instance_monitoring=instance_monitoring,
spot_price=spot_price,
instance_profile_name=instance_profile_name,