From 4967ef5936f3596a946498f6ecd06c80ee5f7a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Sun, 7 Oct 2018 12:09:12 +0200 Subject: [PATCH] Specify region in IP facts (#46210) --- .../cloud/scaleway/scaleway_ip_facts.py | 26 +++++++++++++++++-- .../roles/scaleway_ip_facts/tasks/main.yml | 17 ++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py index 0f8d7f5b9c..cf0c3916c1 100644 --- a/lib/ansible/modules/cloud/scaleway/scaleway_ip_facts.py +++ b/lib/ansible/modules/cloud/scaleway/scaleway_ip_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 ips facts scaleway_ip_facts: + region: par1 ''' RETURN = r''' @@ -52,7 +64,10 @@ scaleway_ip_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, ) @@ -62,10 +77,17 @@ class ScalewayIpFacts(Scaleway): super(ScalewayIpFacts, self).__init__(module) self.name = 'ips' + 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_ip_facts/tasks/main.yml b/test/legacy/roles/scaleway_ip_facts/tasks/main.yml index 826b0685cc..f68fb84063 100644 --- a/test/legacy/roles/scaleway_ip_facts/tasks/main.yml +++ b/test/legacy/roles/scaleway_ip_facts/tasks/main.yml @@ -1,5 +1,8 @@ +# SCW_API_KEY='XXX' ansible-playbook ./test/legacy/scaleway.yml --tags test_scaleway_ip_facts + - name: Get ip informations and register it in a variable scaleway_ip_facts: + region: par1 register: ips - name: Display ips variable @@ -10,3 +13,17 @@ assert: that: - ips is success + +- name: Get ip informations and register it in a variable + scaleway_ip_facts: + region: ams1 + register: ips_ams1 + +- name: Display ips variable + debug: + var: ips_ams1 + +- name: Ensure retrieval of ips facts is success + assert: + that: + - ips_ams1 is success