diff --git a/.github/workflows/integration-tests-pr.yml b/.github/workflows/integration-tests-pr.yml index ffa901e16..8e578a8f9 100644 --- a/.github/workflows/integration-tests-pr.yml +++ b/.github/workflows/integration-tests-pr.yml @@ -44,11 +44,8 @@ jobs: with: python-version: '3.x' - - name: install dependencies - run: make deps - - name: install ansible dependencies - run: ansible-galaxy collection install amazon.aws:==9.1.0 + run: ansible-galaxy collection install amazon.aws:==9.5.0 - name: install collection run: make install diff --git a/docs/modules/instance.md b/docs/modules/instance.md index 0630b91f4..73acbb39e 100644 --- a/docs/modules/instance.md +++ b/docs/modules/instance.md @@ -28,7 +28,6 @@ Manage Linode Instances, Configs, and Disks. stackscript_id: 1337 stackscript_data: variable: value - group: app tags: - env=prod state: present @@ -48,7 +47,6 @@ Manage Linode Instances, Configs, and Disks. stackscript_id: 1337 stackscript_data: variable: value - group: app tags: - env=prod state: present @@ -277,7 +275,7 @@ Manage Linode Instances, Configs, and Disks. | `authorized_keys` |
`list`
|
Optional
| A list of SSH public key parts to deploy for the root user. | | `authorized_users` |
`list`
|
Optional
| A list of usernames. | | `filesystem` |
`str`
|
Optional
| The filesystem to create this disk with. | -| `disk_encryption` |
`str`
|
Optional
| The disk encryption status of this disk.NOTE: Disk encryption may not currently be available to all users. **(Choices: `enabled`, `disabled`)** | +| `disk_encryption` |
`str`
|
Optional
| **READ ONLY** The disk encryption status of this disk.NOTE: Disk encryption may not currently be available to all users and is set at the Linode Level. **(Choices: `enabled`, `disabled`)** | | `image` |
`str`
|
Optional
| An Image ID to deploy the Disk from. | | `root_pass` |
`str`
|
Optional
| The root user’s password on the newly-created Linode. | | `stackscript_id` |
`int`
|
Optional
| The ID of the StackScript to use when creating the instance. See the [Linode API documentation](https://techdocs.akamai.com/linode-api/reference/get-stack-scripts). | diff --git a/plugins/module_utils/doc_fragments/instance.py b/plugins/module_utils/doc_fragments/instance.py index 77e4c55b1..b0cf1bf7e 100644 --- a/plugins/module_utils/doc_fragments/instance.py +++ b/plugins/module_utils/doc_fragments/instance.py @@ -14,7 +14,6 @@ stackscript_id: 1337 stackscript_data: variable: value - group: app tags: - env=prod state: present''', ''' @@ -31,7 +30,6 @@ stackscript_id: 1337 stackscript_data: variable: value - group: app tags: - env=prod state: present diff --git a/plugins/modules/instance.py b/plugins/modules/instance.py index 081b98446..37a74f2be 100644 --- a/plugins/modules/instance.py +++ b/plugins/modules/instance.py @@ -85,8 +85,9 @@ ), "disk_encryption": SpecField( type=FieldType.string, - description="The disk encryption status of this disk." - + "NOTE: Disk encryption may not currently be available to all users.", + description="**READ ONLY** The disk encryption status of this disk." + + "NOTE: Disk encryption may not currently be available to all users " + + "and is set at the Linode Level.", choices=["enabled", "disabled"], ), "image": SpecField( diff --git a/tests/integration/targets/database_config_info/tasks/main.yaml b/tests/integration/targets/database_config_info/tasks/main.yaml index 222133788..3fc5577c1 100644 --- a/tests/integration/targets/database_config_info/tasks/main.yaml +++ b/tests/integration/targets/database_config_info/tasks/main.yaml @@ -86,7 +86,7 @@ - get_database_config_postgresql.config.pg.max_standby_streaming_delay.type == "integer" - get_database_config_postgresql.config.pg.max_wal_senders.type == "integer" - get_database_config_postgresql.config.pg.max_worker_processes.type == "integer" - - get_database_config_postgresql.config.pg.password_encryption.default == "md5" + - get_database_config_postgresql.config.pg.password_encryption.type == "string" environment: LINODE_UA_PREFIX: '{{ ua_prefix }}' diff --git a/tests/integration/targets/instance_basic/tasks/main.yaml b/tests/integration/targets/instance_basic/tasks/main.yaml index 7676aa3bc..c3615f45c 100644 --- a/tests/integration/targets/instance_basic/tasks/main.yaml +++ b/tests/integration/targets/instance_basic/tasks/main.yaml @@ -54,7 +54,6 @@ linode.cloud.instance: label: '{{ create.instance.label }}' region: '{{ pg_region }}' - group: funny type: g6-standard-2 image: linode/ubuntu22.04 private_ip: true @@ -67,7 +66,6 @@ linode.cloud.instance: label: '!!Invalid!!' region: '{{ pg_region }}' - group: funny type: g6-standard-2 image: linode/ubuntu22.04 private_ip: true @@ -105,11 +103,13 @@ failed_when: - "'additional_ipv4' not in invalid_update_remove_ips.msg" + - set_fact: + updated_label: '{{ create.instance.label }}-updated' + - name: Update the instance linode.cloud.instance: - label: '{{ create.instance.label }}' + label: '{{ updated_label }}' region: '{{ pg_region }}' - group: funny type: g6-standard-1 image: linode/ubuntu22.04 private_ip: true @@ -119,7 +119,7 @@ - name: Assert update assert: that: - - update.instance.group == 'funny' + - update.instance.label == updated_label - name: Get info about the instance by id linode.cloud.instance_info: @@ -137,7 +137,7 @@ - name: Get info about the instance by label linode.cloud.instance_info: - label: '{{ create.instance.label }}' + label: '{{ updated_label }}' register: info_label - name: Assert instance info @@ -173,7 +173,7 @@ instance_pg.instance.placement_group.id == pg_created.placement_group.id always: - - ignore_errors: yes + - ignore_errors: true block: - name: Delete a Linode instance linode.cloud.instance: diff --git a/tests/integration/targets/instance_interfaces/tasks/main.yaml b/tests/integration/targets/instance_interfaces/tasks/main.yaml index 48cb969db..b76725c26 100644 --- a/tests/integration/targets/instance_interfaces/tasks/main.yaml +++ b/tests/integration/targets/instance_interfaces/tasks/main.yaml @@ -31,7 +31,6 @@ linode.cloud.instance: label: '{{ create_interface.instance.label }}' region: us-ord - group: funny type: g6-standard-1 image: linode/ubuntu22.04 private_ip: true @@ -54,7 +53,6 @@ linode.cloud.instance: label: '{{ create_interface.instance.label }}' region: us-ord - group: funny type: g6-standard-1 image: linode/ubuntu22.04 private_ip: true