Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/integration-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions docs/modules/instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Manage Linode Instances, Configs, and Disks.
stackscript_id: 1337
stackscript_data:
variable: value
group: app
tags:
- env=prod
state: present
Expand All @@ -48,7 +47,6 @@ Manage Linode Instances, Configs, and Disks.
stackscript_id: 1337
stackscript_data:
variable: value
group: app
tags:
- env=prod
state: present
Expand Down Expand Up @@ -277,7 +275,7 @@ Manage Linode Instances, Configs, and Disks.
| `authorized_keys` | <center>`list`</center> | <center>Optional</center> | A list of SSH public key parts to deploy for the root user. |
| `authorized_users` | <center>`list`</center> | <center>Optional</center> | A list of usernames. |
| `filesystem` | <center>`str`</center> | <center>Optional</center> | The filesystem to create this disk with. |
| `disk_encryption` | <center>`str`</center> | <center>Optional</center> | The disk encryption status of this disk.NOTE: Disk encryption may not currently be available to all users. **(Choices: `enabled`, `disabled`)** |
| `disk_encryption` | <center>`str`</center> | <center>Optional</center> | **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` | <center>`str`</center> | <center>Optional</center> | An Image ID to deploy the Disk from. |
| `root_pass` | <center>`str`</center> | <center>Optional</center> | The root user’s password on the newly-created Linode. |
| `stackscript_id` | <center>`int`</center> | <center>Optional</center> | 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). |
Expand Down
2 changes: 0 additions & 2 deletions plugins/module_utils/doc_fragments/instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
stackscript_id: 1337
stackscript_data:
variable: value
group: app
tags:
- env=prod
state: present''', '''
Expand All @@ -31,7 +30,6 @@
stackscript_id: 1337
stackscript_data:
variable: value
group: app
tags:
- env=prod
state: present
Expand Down
5 changes: 3 additions & 2 deletions plugins/modules/instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/targets/instance_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading