Skip to content

Commit 99dc320

Browse files
Merge pull request #696 from linode/dev
Release v0.41.0
2 parents 2c5fe73 + 4560a27 commit 99dc320

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

.github/workflows/integration-tests-pr.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,8 @@ jobs:
4444
with:
4545
python-version: '3.x'
4646

47-
- name: install dependencies
48-
run: make deps
49-
5047
- name: install ansible dependencies
51-
run: ansible-galaxy collection install amazon.aws:==9.1.0
48+
run: ansible-galaxy collection install amazon.aws:==9.5.0
5249

5350
- name: install collection
5451
run: make install

docs/modules/instance.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Manage Linode Instances, Configs, and Disks.
2828
stackscript_id: 1337
2929
stackscript_data:
3030
variable: value
31-
group: app
3231
tags:
3332
- env=prod
3433
state: present
@@ -48,7 +47,6 @@ Manage Linode Instances, Configs, and Disks.
4847
stackscript_id: 1337
4948
stackscript_data:
5049
variable: value
51-
group: app
5250
tags:
5351
- env=prod
5452
state: present
@@ -277,7 +275,7 @@ Manage Linode Instances, Configs, and Disks.
277275
| `authorized_keys` | <center>`list`</center> | <center>Optional</center> | A list of SSH public key parts to deploy for the root user. |
278276
| `authorized_users` | <center>`list`</center> | <center>Optional</center> | A list of usernames. |
279277
| `filesystem` | <center>`str`</center> | <center>Optional</center> | The filesystem to create this disk with. |
280-
| `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`)** |
278+
| `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`)** |
281279
| `image` | <center>`str`</center> | <center>Optional</center> | An Image ID to deploy the Disk from. |
282280
| `root_pass` | <center>`str`</center> | <center>Optional</center> | The root user’s password on the newly-created Linode. |
283281
| `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). |

plugins/module_utils/doc_fragments/instance.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
stackscript_id: 1337
1515
stackscript_data:
1616
variable: value
17-
group: app
1817
tags:
1918
- env=prod
2019
state: present''', '''
@@ -31,7 +30,6 @@
3130
stackscript_id: 1337
3231
stackscript_data:
3332
variable: value
34-
group: app
3533
tags:
3634
- env=prod
3735
state: present

plugins/modules/instance.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@
8585
),
8686
"disk_encryption": SpecField(
8787
type=FieldType.string,
88-
description="The disk encryption status of this disk."
89-
+ "NOTE: Disk encryption may not currently be available to all users.",
88+
description="**READ ONLY** The disk encryption status of this disk."
89+
+ "NOTE: Disk encryption may not currently be available to all users "
90+
+ "and is set at the Linode Level.",
9091
choices=["enabled", "disabled"],
9192
),
9293
"image": SpecField(

tests/integration/targets/database_config_info/tasks/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
- get_database_config_postgresql.config.pg.max_standby_streaming_delay.type == "integer"
8787
- get_database_config_postgresql.config.pg.max_wal_senders.type == "integer"
8888
- get_database_config_postgresql.config.pg.max_worker_processes.type == "integer"
89-
- get_database_config_postgresql.config.pg.password_encryption.default == "md5"
89+
- get_database_config_postgresql.config.pg.password_encryption.type == "string"
9090

9191
environment:
9292
LINODE_UA_PREFIX: '{{ ua_prefix }}'

tests/integration/targets/instance_basic/tasks/main.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
linode.cloud.instance:
5555
label: '{{ create.instance.label }}'
5656
region: '{{ pg_region }}'
57-
group: funny
5857
type: g6-standard-2
5958
image: linode/ubuntu22.04
6059
private_ip: true
@@ -67,7 +66,6 @@
6766
linode.cloud.instance:
6867
label: '!!Invalid!!'
6968
region: '{{ pg_region }}'
70-
group: funny
7169
type: g6-standard-2
7270
image: linode/ubuntu22.04
7371
private_ip: true
@@ -105,11 +103,13 @@
105103
failed_when:
106104
- "'additional_ipv4' not in invalid_update_remove_ips.msg"
107105

106+
- set_fact:
107+
updated_label: '{{ create.instance.label }}-updated'
108+
108109
- name: Update the instance
109110
linode.cloud.instance:
110-
label: '{{ create.instance.label }}'
111+
label: '{{ updated_label }}'
111112
region: '{{ pg_region }}'
112-
group: funny
113113
type: g6-standard-1
114114
image: linode/ubuntu22.04
115115
private_ip: true
@@ -119,7 +119,7 @@
119119
- name: Assert update
120120
assert:
121121
that:
122-
- update.instance.group == 'funny'
122+
- update.instance.label == updated_label
123123

124124
- name: Get info about the instance by id
125125
linode.cloud.instance_info:
@@ -137,7 +137,7 @@
137137

138138
- name: Get info about the instance by label
139139
linode.cloud.instance_info:
140-
label: '{{ create.instance.label }}'
140+
label: '{{ updated_label }}'
141141
register: info_label
142142

143143
- name: Assert instance info
@@ -173,7 +173,7 @@
173173
instance_pg.instance.placement_group.id == pg_created.placement_group.id
174174

175175
always:
176-
- ignore_errors: yes
176+
- ignore_errors: true
177177
block:
178178
- name: Delete a Linode instance
179179
linode.cloud.instance:

tests/integration/targets/instance_interfaces/tasks/main.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
linode.cloud.instance:
3232
label: '{{ create_interface.instance.label }}'
3333
region: us-ord
34-
group: funny
3534
type: g6-standard-1
3635
image: linode/ubuntu22.04
3736
private_ip: true
@@ -54,7 +53,6 @@
5453
linode.cloud.instance:
5554
label: '{{ create_interface.instance.label }}'
5655
region: us-ord
57-
group: funny
5856
type: g6-standard-1
5957
image: linode/ubuntu22.04
6058
private_ip: true

0 commit comments

Comments
 (0)