update scaleway zones (#1690)

2024-09-14 20:13:21 +02:00 · 2021-01-28 12:51:07 +01:00 · 2021-01-28 12:51:07 +01:00 · db656705b0
commit db656705b0
parent f955a85848
23 changed files with 88 additions and 1 deletions
--- a/changelogs/fragments/1690-scaleway-regions.yaml
+++ 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).
--- a/plugins/inventory/scaleway.py
+++ b/plugins/inventory/scaleway.py
@ -23,6 +23,8 @@ DOCUMENTATION = '''
            default:
                - ams1
                - par1
+                - par2
+                - waw1
        tags:
            description: Filter results on a specific tag
            type: list
--- 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",
 ]
--- 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
--- 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:
--- 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'''
--- 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'''
--- 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
--- 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'''
--- 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'''
--- 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
--- 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:
--- 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

--- 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

--- 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
--- 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'''
--- 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'''
--- 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'''
--- 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'''
--- 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 = '''
--- 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:
--- 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'''
--- 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'''