diff --git a/docs/modules/instance.md b/docs/modules/instance.md index ec74812d..2ba7737b 100644 --- a/docs/modules/instance.md +++ b/docs/modules/instance.md @@ -148,6 +148,7 @@ Manage Linode Instances, Configs, and Disks. | `migration_type` |
`str`
|
Optional
| The type of migration to use for Region and Type migrations. **(Choices: `cold`, `warm`; Default: `cold`)** | | `auto_disk_resize` |
`bool`
|
Optional
| Whether implicitly created disks should be resized during a type change operation. **(Default: `False`)** | | `tags` |
`list`
|
Optional
| An array of tags applied to this object. Tags are for organizational purposes only. **(Updatable)** | +| `capabilities` |
`list`
|
Optional
| Read-only. A list of capabilities this compute instance supports. | | [`placement_group` (sub-options)](#placement_group) |
`dict`
|
Optional
| A Placement Group to create this Linode under. | | `disk_encryption` |
`str`
|
Optional
| The disk encryption status of this Linode. NOTE: Disk encryption may not currently be available to all users. **(Choices: `enabled`, `disabled`)** | | `swap_size` |
`int`
|
Optional
| When deploying from an Image, this field is optional, otherwise it is ignored. This is used to set the swap disk size for the newly-created Linode. | diff --git a/docs/modules/volume.md b/docs/modules/volume.md index 108c4a7f..495b716b 100644 --- a/docs/modules/volume.md +++ b/docs/modules/volume.md @@ -75,6 +75,7 @@ Manage a Linode Volume. | `region` |
`str`
|
Optional
| The location to deploy the volume in. See https://api.linode.com/v4/regions | | `size` |
`int`
|
Optional
| The size of this volume, in GB. Be aware that volumes may only be resized up after creation. **(Updatable)** | | `attached` |
`bool`
|
Optional
| If true, the volume will be attached to a Linode. Otherwise, the volume will be detached. **(Default: `True`; Updatable)** | +| `encryption` |
`str`
|
Optional
| Enables encryption on the volume. Full disk encryption ensures the data stored on a block storage volume drive is secure. **(Choices: `disabled`, `enabled`)** | | `wait_timeout` |
`int`
|
Optional
| The amount of time, in seconds, to wait for a volume to have the active status. **(Default: `240`)** | | `source_volume_id` |
`int`
|
Optional
| The volume id of the desired volume to clone. | | `tags` |
`list`
|
Optional
| The tags to be attached to the volume. | diff --git a/plugins/modules/instance.py b/plugins/modules/instance.py index d7740953..3a7d5cda 100644 --- a/plugins/modules/instance.py +++ b/plugins/modules/instance.py @@ -524,6 +524,13 @@ ], editable=True, ), + "capabilities": SpecField( + type=FieldType.list, + element_type=FieldType.string, + description=[ + "Read-only. A list of capabilities this compute instance supports.", + ], + ), "placement_group": SpecField( type=FieldType.dict, suboptions=linode_instance_placement_group_spec, diff --git a/plugins/modules/volume.py b/plugins/modules/volume.py index d6cd04aa..fbae2d26 100644 --- a/plugins/modules/volume.py +++ b/plugins/modules/volume.py @@ -74,6 +74,14 @@ "Otherwise, the volume will be detached." ], ), + "encryption": SpecField( + type=FieldType.string, + description=[ + "Enables encryption on the volume. Full disk encryption ensures " + "the data stored on a block storage volume drive is secure." + ], + choices=["disabled", "enabled"], + ), "wait_timeout": SpecField( type=FieldType.integer, default=240, diff --git a/tests/integration/targets/instance_basic/tasks/main.yaml b/tests/integration/targets/instance_basic/tasks/main.yaml index 1366390b..7676aa3b 100644 --- a/tests/integration/targets/instance_basic/tasks/main.yaml +++ b/tests/integration/targets/instance_basic/tasks/main.yaml @@ -133,6 +133,7 @@ - info_id.instance.region == pg_region - info_id.configs|length == 1 - info_id.networking.ipv4.public[0].address != None + - info_id.instance.capabilities == create.instance.capabilities - name: Get info about the instance by label linode.cloud.instance_info: diff --git a/tests/integration/targets/volume_basic/tasks/main.yaml b/tests/integration/targets/volume_basic/tasks/main.yaml index 856a29f9..d3f99639 100644 --- a/tests/integration/targets/volume_basic/tasks/main.yaml +++ b/tests/integration/targets/volume_basic/tasks/main.yaml @@ -95,6 +95,7 @@ that: - volume_info_label.volume.linode_id == attach_volume.volume.linode_id - volume_info_label.volume.size == attach_volume.volume.size + - volume_info_label.volume.encryption == attach_volume.volume.encryption - name: Detach the volume linode.cloud.volume: