diff --git a/changelogs/fragments/1690-scaleway-regions.yaml b/changelogs/fragments/1690-scaleway-regions.yaml new file mode 100644 index 0000000000..6788246f7d --- /dev/null +++ b/changelogs/fragments/1690-scaleway-regions.yaml @@ -0,0 +1,2 @@ +minor_changes: + - scaleway modules and inventory plugin - update regions and zones to add the new ones (https://github.com/ansible-collections/community.general/pull/1690). diff --git a/plugins/inventory/scaleway.py b/plugins/inventory/scaleway.py index d7d55ef9e3..4cc169569f 100644 --- a/plugins/inventory/scaleway.py +++ b/plugins/inventory/scaleway.py @@ -24,6 +24,8 @@ DOCUMENTATION = ''' default: - ams1 - par1 + - par2 + - waw1 tags: description: Filter results on a specific tag type: list diff --git a/plugins/module_utils/scaleway.py b/plugins/module_utils/scaleway.py index abb6802105..f5107feda2 100644 --- a/plugins/module_utils/scaleway.py +++ b/plugins/module_utils/scaleway.py @@ -169,8 +169,14 @@ SCALEWAY_LOCATION = { 'par1': {'name': 'Paris 1', 'country': 'FR', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/fr-par-1'}, 'EMEA-FR-PAR1': {'name': 'Paris 1', 'country': 'FR', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/fr-par-1'}, + 'par2': {'name': 'Paris 2', 'country': 'FR', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/fr-par-2'}, + 'EMEA-FR-PAR2': {'name': 'Paris 2', 'country': 'FR', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/fr-par-2'}, + 'ams1': {'name': 'Amsterdam 1', 'country': 'NL', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/nl-ams-1'}, - 'EMEA-NL-EVS': {'name': 'Amsterdam 1', 'country': 'NL', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/nl-ams-1'} + 'EMEA-NL-EVS': {'name': 'Amsterdam 1', 'country': 'NL', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/nl-ams-1'}, + + 'waw1': {'name': 'Warsaw 1', 'country': 'PL', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/pl-waw-1'}, + 'EMEA-PL-WAW1': {'name': 'Warsaw 1', 'country': 'PL', "api_endpoint": 'https://api.scaleway.com/instance/v1/zones/pl-waw-1'}, } SCALEWAY_ENDPOINT = "https://api.scaleway.com" @@ -178,9 +184,12 @@ SCALEWAY_ENDPOINT = "https://api.scaleway.com" SCALEWAY_REGIONS = [ "fr-par", "nl-ams", + "pl-waw", ] SCALEWAY_ZONES = [ "fr-par-1", + "fr-par-2", "nl-ams-1", + "pl-waw-1", ] diff --git a/plugins/modules/cloud/scaleway/scaleway_compute.py b/plugins/modules/cloud/scaleway/scaleway_compute.py index 2ff2aebc86..8df9a5e6ff 100644 --- a/plugins/modules/cloud/scaleway/scaleway_compute.py +++ b/plugins/modules/cloud/scaleway/scaleway_compute.py @@ -85,6 +85,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 commercial_type: type: str diff --git a/plugins/modules/cloud/scaleway/scaleway_database_backup.py b/plugins/modules/cloud/scaleway/scaleway_database_backup.py index f884b61fe1..578032458d 100644 --- a/plugins/modules/cloud/scaleway/scaleway_database_backup.py +++ b/plugins/modules/cloud/scaleway/scaleway_database_backup.py @@ -44,6 +44,7 @@ options: choices: - fr-par - nl-ams + - pl-waw id: description: diff --git a/plugins/modules/cloud/scaleway/scaleway_image_facts.py b/plugins/modules/cloud/scaleway/scaleway_image_facts.py index 5471e3bf98..31bbfa76ad 100644 --- a/plugins/modules/cloud/scaleway/scaleway_image_facts.py +++ b/plugins/modules/cloud/scaleway/scaleway_image_facts.py @@ -35,6 +35,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_image_info.py b/plugins/modules/cloud/scaleway/scaleway_image_info.py index c9c17bcb2b..3fad216ee5 100644 --- a/plugins/modules/cloud/scaleway/scaleway_image_info.py +++ b/plugins/modules/cloud/scaleway/scaleway_image_info.py @@ -32,6 +32,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_ip.py b/plugins/modules/cloud/scaleway/scaleway_ip.py index 37e2799eff..26da122e31 100644 --- a/plugins/modules/cloud/scaleway/scaleway_ip.py +++ b/plugins/modules/cloud/scaleway/scaleway_ip.py @@ -46,6 +46,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 id: type: str diff --git a/plugins/modules/cloud/scaleway/scaleway_ip_facts.py b/plugins/modules/cloud/scaleway/scaleway_ip_facts.py index dbf272af7f..4227f36067 100644 --- a/plugins/modules/cloud/scaleway/scaleway_ip_facts.py +++ b/plugins/modules/cloud/scaleway/scaleway_ip_facts.py @@ -34,6 +34,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_ip_info.py b/plugins/modules/cloud/scaleway/scaleway_ip_info.py index 8a272cb130..145fb20338 100644 --- a/plugins/modules/cloud/scaleway/scaleway_ip_info.py +++ b/plugins/modules/cloud/scaleway/scaleway_ip_info.py @@ -30,6 +30,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_lb.py b/plugins/modules/cloud/scaleway/scaleway_lb.py index ee40abd9f9..a9358188dd 100644 --- a/plugins/modules/cloud/scaleway/scaleway_lb.py +++ b/plugins/modules/cloud/scaleway/scaleway_lb.py @@ -59,6 +59,7 @@ options: choices: - nl-ams - fr-par + - pl-waw tags: type: list diff --git a/plugins/modules/cloud/scaleway/scaleway_security_group.py b/plugins/modules/cloud/scaleway/scaleway_security_group.py index 7148d5200d..9303e06e00 100644 --- a/plugins/modules/cloud/scaleway/scaleway_security_group.py +++ b/plugins/modules/cloud/scaleway/scaleway_security_group.py @@ -46,6 +46,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 name: description: diff --git a/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py b/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py index 1d40fb65cf..a43bfedb94 100644 --- a/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py +++ b/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py @@ -31,6 +31,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 extends_documentation_fragment: - community.general.scaleway diff --git a/plugins/modules/cloud/scaleway/scaleway_security_group_info.py b/plugins/modules/cloud/scaleway/scaleway_security_group_info.py index 8bee97c5c1..d3488f0c8b 100644 --- a/plugins/modules/cloud/scaleway/scaleway_security_group_info.py +++ b/plugins/modules/cloud/scaleway/scaleway_security_group_info.py @@ -27,6 +27,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 extends_documentation_fragment: - community.general.scaleway diff --git a/plugins/modules/cloud/scaleway/scaleway_security_group_rule.py b/plugins/modules/cloud/scaleway/scaleway_security_group_rule.py index 495d540a93..054a4d4790 100644 --- a/plugins/modules/cloud/scaleway/scaleway_security_group_rule.py +++ b/plugins/modules/cloud/scaleway/scaleway_security_group_rule.py @@ -43,6 +43,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 protocol: type: str diff --git a/plugins/modules/cloud/scaleway/scaleway_server_facts.py b/plugins/modules/cloud/scaleway/scaleway_server_facts.py index 1206216620..d3e7366934 100644 --- a/plugins/modules/cloud/scaleway/scaleway_server_facts.py +++ b/plugins/modules/cloud/scaleway/scaleway_server_facts.py @@ -34,6 +34,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_server_info.py b/plugins/modules/cloud/scaleway/scaleway_server_info.py index 35d1c25604..43b0badc14 100644 --- a/plugins/modules/cloud/scaleway/scaleway_server_info.py +++ b/plugins/modules/cloud/scaleway/scaleway_server_info.py @@ -30,6 +30,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py b/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py index ce87ebc4fb..25f99e729b 100644 --- a/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py +++ b/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py @@ -34,6 +34,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_snapshot_info.py b/plugins/modules/cloud/scaleway/scaleway_snapshot_info.py index 2d4481945e..f31b74b00e 100644 --- a/plugins/modules/cloud/scaleway/scaleway_snapshot_info.py +++ b/plugins/modules/cloud/scaleway/scaleway_snapshot_info.py @@ -30,6 +30,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_user_data.py b/plugins/modules/cloud/scaleway/scaleway_user_data.py index 539a035056..4a38e76d72 100644 --- a/plugins/modules/cloud/scaleway/scaleway_user_data.py +++ b/plugins/modules/cloud/scaleway/scaleway_user_data.py @@ -48,6 +48,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = ''' diff --git a/plugins/modules/cloud/scaleway/scaleway_volume.py b/plugins/modules/cloud/scaleway/scaleway_volume.py index 4a3f062d53..e879d3c95c 100644 --- a/plugins/modules/cloud/scaleway/scaleway_volume.py +++ b/plugins/modules/cloud/scaleway/scaleway_volume.py @@ -41,6 +41,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 name: type: str description: diff --git a/plugins/modules/cloud/scaleway/scaleway_volume_facts.py b/plugins/modules/cloud/scaleway/scaleway_volume_facts.py index b434049f50..e894f96548 100644 --- a/plugins/modules/cloud/scaleway/scaleway_volume_facts.py +++ b/plugins/modules/cloud/scaleway/scaleway_volume_facts.py @@ -34,6 +34,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/scaleway/scaleway_volume_info.py b/plugins/modules/cloud/scaleway/scaleway_volume_info.py index a0885d2b88..ff6093e830 100644 --- a/plugins/modules/cloud/scaleway/scaleway_volume_info.py +++ b/plugins/modules/cloud/scaleway/scaleway_volume_info.py @@ -30,6 +30,10 @@ options: - EMEA-NL-EVS - par1 - EMEA-FR-PAR1 + - par2 + - EMEA-FR-PAR2 + - waw1 + - EMEA-PL-WAW1 ''' EXAMPLES = r'''