internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Perform region validation early to be more explicit about invalid region failures

Browse Source
This commit is contained in:
Matt Martz
2014-08-31 08:58:16 -05:00
parent 69e7999586
commit 55ed4489e3
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/module_utils/rax.py
View File

@@ -212,7 +212,7 @@ def rax_required_together():
return [['api_key', 'username']]
def setup_rax_module(module, rax_module):
def setup_rax_module(module, rax_module, region_required=True):
rax_module.USER_AGENT = 'ansible/%s %s' % (ANSIBLE_VERSION,
rax_module.USER_AGENT)
@@ -270,7 +270,8 @@ def setup_rax_module(module, rax_module):
except Exception, e:
module.fail_json(msg='%s' % e.message)
rax_module.USER_AGENT = 'ansible/%s %s' % (ANSIBLE_VERSION,
rax_module.USER_AGENT)
if region_required and region not in rax_module.regions:
module.fail_json(msg='%s is not a valid region, must be one of: %s' %
(region, ','.join(rax_module.regions)))
return rax_module