ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-03 04:34:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge f6c20c374a into 84b5d38c51

Browse source
This commit is contained in:
Mia-Cross 2025-07-30 09:38:51 +00:00 • committed by GitHub
commit c8e5906ca1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 118 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/10424-scaleway-update-zones.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- scaleway_* modules - update available zones and API URLs (https://github.com/ansible-collections/community.general/issues/10383, https://github.com/ansible-collections/community.general/pull/10424).

5
plugins/inventory/scaleway.py
View file

@ -27,9 +27,14 @@ options:
elements: string elements: string
default: default:
- ams1 - ams1
- ams2
- ams3
- par1 - par1
- par2 - par2
- par3
- waw1 - waw1
- waw2
- waw3
tags: tags:
description: Filter results on a specific tag. description: Filter results on a specific tag.
type: list type: list

42
plugins/module_utils/scaleway.py
View file

@ -353,11 +353,18 @@ SCALEWAY_LOCATION = {
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/fr-par-2' 'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/fr-par-2'
}, },
'par3': {
'name': 'Paris 3',
'country': 'FR',
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/fr-par-3',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/fr-par-3'
},
'ams1': { 'ams1': {
'name': 'Amsterdam 1', 'name': 'Amsterdam 1',
'country': 'NL', 'country': 'NL',
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1', 'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/nl-ams-1',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/nl-ams-10' 'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/nl-ams-1'
}, },
'EMEA-NL-EVS': { 'EMEA-NL-EVS': {
@ -367,6 +374,20 @@ SCALEWAY_LOCATION = {
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/nl-ams-1' 'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/nl-ams-1'
}, },
'ams2': {
'name': 'Amsterdam 2',
'country': 'NL',
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/nl-ams-2',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/nl-ams-2'
},
'ams3': {
'name': 'Amsterdam 3',
'country': 'NL',
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/nl-ams-3',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/nl-ams-3'
},
'waw1': { 'waw1': {
'name': 'Warsaw 1', 'name': 'Warsaw 1',
'country': 'PL', 'country': 'PL',
@ -380,6 +401,20 @@ SCALEWAY_LOCATION = {
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/pl-waw-1', 'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/pl-waw-1',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/pl-waw-1' 'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/pl-waw-1'
}, },
'waw2': {
'name': 'Warsaw 2',
'country': 'PL',
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/pl-waw-2',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/pl-waw-2'
},
'waw3': {
'name': 'Warsaw 3',
'country': 'PL',
'api_endpoint': 'https://api.scaleway.com/instance/v1/zones/pl-waw-3',
'api_endpoint_vpc': 'https://api.scaleway.com/vpc/v1/zones/pl-waw-3'
},
} }
SCALEWAY_ENDPOINT = "https://api.scaleway.com" SCALEWAY_ENDPOINT = "https://api.scaleway.com"
@ -393,6 +428,11 @@ SCALEWAY_REGIONS = [
SCALEWAY_ZONES = [ SCALEWAY_ZONES = [
"fr-par-1", "fr-par-1",
"fr-par-2", "fr-par-2",
"fr-par-3",
"nl-ams-1", "nl-ams-1",
"nl-ams-2",
"nl-ams-3",
"pl-waw-1", "pl-waw-1",
"pl-waw-2",
"pl-waw-3",
] ]

5
plugins/modules/scaleway_compute.py
View file

@ -96,12 +96,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
commercial_type: commercial_type:
type: str type: str

5
plugins/modules/scaleway_compute_private_network.py
View file

@ -52,12 +52,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
compute_id: compute_id:
type: str type: str

5
plugins/modules/scaleway_image_info.py
View file

@ -30,12 +30,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
""" """
EXAMPLES = r""" EXAMPLES = r"""

5
plugins/modules/scaleway_ip.py
View file

@ -51,12 +51,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
id: id:
type: str type: str

5
plugins/modules/scaleway_ip_info.py
View file

@ -30,12 +30,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
""" """
EXAMPLES = r""" EXAMPLES = r"""

5
plugins/modules/scaleway_private_network.py
View file

@ -52,12 +52,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
name: name:
type: str type: str

5
plugins/modules/scaleway_security_group.py
View file

@ -50,12 +50,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
name: name:
description: description:

5
plugins/modules/scaleway_security_group_info.py
View file

@ -25,12 +25,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
extends_documentation_fragment: extends_documentation_fragment:
- community.general.scaleway - community.general.scaleway
- community.general.attributes - community.general.attributes

5
plugins/modules/scaleway_security_group_rule.py
View file

@ -46,12 +46,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
protocol: protocol:
type: str type: str

5
plugins/modules/scaleway_server_info.py
View file

@ -30,12 +30,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
""" """
EXAMPLES = r""" EXAMPLES = r"""

5
plugins/modules/scaleway_snapshot_info.py
View file

@ -30,12 +30,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
""" """
EXAMPLES = r""" EXAMPLES = r"""

5
plugins/modules/scaleway_user_data.py
View file

@ -53,12 +53,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
""" """
EXAMPLES = r""" EXAMPLES = r"""

5
plugins/modules/scaleway_volume.py
View file

@ -45,12 +45,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
name: name:
type: str type: str
description: description:

5
plugins/modules/scaleway_volume_info.py
View file

@ -30,12 +30,17 @@ options:
choices: choices:
- ams1 - ams1
- EMEA-NL-EVS - EMEA-NL-EVS
- ams2
- ams3
- par1 - par1
- EMEA-FR-PAR1 - EMEA-FR-PAR1
- par2 - par2
- EMEA-FR-PAR2 - EMEA-FR-PAR2
- par3
- waw1 - waw1
- EMEA-PL-WAW1 - EMEA-PL-WAW1
- waw2
- waw3
""" """
EXAMPLES = r""" EXAMPLES = r"""