From 3a1d8867ed3e45554b2017e06019739868f159c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= <remy.leone@gmail.com>
Date: Sun, 7 Oct 2018 12:08:50 +0200
Subject: [PATCH] Add region to server facts (#46212)

---
 .../cloud/scaleway/scaleway_server_facts.py   | 27 +++++++++++++++++--
 .../scaleway_server_facts/tasks/main.yml      | 17 ++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py
index fb5134c0c71..34cb4a9432d 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_server_facts.py
@@ -22,11 +22,23 @@ author:
   - "Yanis Guenane (@Spredzy)"
   - "Remy Leone (@sieben)"
 extends_documentation_fragment: scaleway
+options:
+  region:
+    version_added: "2.8"
+    description:
+     - Scaleway region to use (for example par1).
+    required: true
+    choices:
+      - ams1
+      - EMEA-NL-EVS
+      - par1
+      - EMEA-FR-PAR1
 '''
 
 EXAMPLES = r'''
 - name: Gather Scaleway servers facts
   scaleway_server_facts:
+    region: par1
 '''
 
 RETURN = r'''
@@ -138,7 +150,10 @@ scaleway_server_facts:
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.scaleway import (
-    Scaleway, ScalewayException, scaleway_argument_spec
+    Scaleway,
+    ScalewayException,
+    scaleway_argument_spec,
+    SCALEWAY_LOCATION,
 )
 
 
@@ -148,10 +163,18 @@ class ScalewayServerFacts(Scaleway):
         super(ScalewayServerFacts, self).__init__(module)
         self.name = 'servers'
 
+        region = module.params["region"]
+        self.module.params['api_url'] = SCALEWAY_LOCATION[region]["api_endpoint"]
+
 
 def main():
+    argument_spec = scaleway_argument_spec()
+    argument_spec.update(dict(
+        region=dict(required=True, choices=SCALEWAY_LOCATION.keys()),
+    ))
+
     module = AnsibleModule(
-        argument_spec=scaleway_argument_spec(),
+        argument_spec=argument_spec,
         supports_check_mode=True,
     )
 
diff --git a/test/legacy/roles/scaleway_server_facts/tasks/main.yml b/test/legacy/roles/scaleway_server_facts/tasks/main.yml
index 746a12f17bc..f906560ae29 100644
--- a/test/legacy/roles/scaleway_server_facts/tasks/main.yml
+++ b/test/legacy/roles/scaleway_server_facts/tasks/main.yml
@@ -1,5 +1,8 @@
+# SCW_API_KEY='XXX' ansible-playbook ./test/legacy/scaleway.yml --tags test_scaleway_server_facts
+
 - name: Get server informations and register it in a variable
   scaleway_server_facts:
+    region: par1
   register: servers
 
 - name: Display servers variable
@@ -10,3 +13,17 @@
   assert:
     that:
       - servers is success
+
+- name: Get server informations and register it in a variable
+  scaleway_server_facts:
+    region: ams1
+  register: ams1_servers
+
+- name: Display servers variable
+  debug:
+    var: ams1_servers
+
+- name: Ensure retrieval of servers facts is success
+  assert:
+    that:
+      - ams1_servers is success