Skip to content

Commit

Permalink
Merge remote-tracking branch 'live/dev' into new/vpc_ips
Browse files Browse the repository at this point in the history
  • Loading branch information
jriddle-linode committed Nov 6, 2023
2 parents af7bae3 + 15b78af commit c100797
Show file tree
Hide file tree
Showing 68 changed files with 91 additions and 69 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install: build
ansible-galaxy collection install *.tar.gz --force -p $(COLLECTIONS_PATH)

deps:
pip install --upgrade -r requirements.txt -r requirements-dev.txt
pip install -r requirements.txt -r requirements-dev.txt --upgrade

lint:
pylint plugins
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# linode-api4>=5.9.0
git+https://github.com/linode/linode_api4-python@proj/vpc
polling>=0.3.2
types-requests==2.31.0.2
types-requests==2.31.0.10
ansible-specdoc>=0.0.14
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/domain_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/domain_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/domain_record/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/domain_zone_file/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/event_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/firewall_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/firewall_device/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,6 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'


2 changes: 1 addition & 1 deletion tests/integration/targets/firewall_icmp/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/firewall_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/firewall_update/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -887,4 +887,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/image_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/image_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/image_upload/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/instance_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/instance_booted/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
<<<<<<< HEAD
=======
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

>>>>>>> 3ee3aabf6b1a20187f78b4f2371ab8902cc76b7e
3 changes: 2 additions & 1 deletion tests/integration/targets/instance_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/instance_metadata/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/instance_reboot/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/instance_timeout/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/instance_type_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/ip_assign/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'


1 change: 1 addition & 0 deletions tests/integration/targets/ip_info/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file or "" }}'

4 changes: 3 additions & 1 deletion tests/integration/targets/ip_rdns/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,6 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'


2 changes: 1 addition & 1 deletion tests/integration/targets/ip_share/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@
LINODE_UA_PREFIX: '{{ ua_prefix }}'
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/ipv6_range_info/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/lke_cluster_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/lke_version_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/mysql_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/mysql_complex/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/nodebalancer_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/nodebalancer_node/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/nodebalancer_stats/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/object_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/postgresql_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/profile_info/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

2 changes: 1 addition & 1 deletion tests/integration/targets/region_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/ssh_key_info/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/ssh_key_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/stackscript_info/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/stackscript_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
2 changes: 1 addition & 1 deletion tests/integration/targets/token_basic/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'
3 changes: 2 additions & 1 deletion tests/integration/targets/token_info/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

3 changes: 2 additions & 1 deletion tests/integration/targets/token_list/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@
LINODE_API_TOKEN: '{{ api_token }}'
LINODE_API_URL: '{{ api_url }}'
LINODE_API_VERSION: '{{ api_version }}'
LINODE_CA: '{{ ca_file }}'
LINODE_CA: '{{ ca_file or "" }}'

Loading

0 comments on commit c100797

Please sign in to comment.