cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #667 from sivel/rax-identity-fixups

Browse source 
rax_identity: Small fix ups
This commit is contained in:
Matt Martz 2015-01-20 10:38:16 -06:00
commit 1668f45447
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/rackspace/rax_identity.py
View file

@ -55,10 +55,6 @@ except ImportError:
def cloud_identity(module, state, identity): def cloud_identity(module, state, identity):
for arg in (state, identity):
if not arg:
module.fail_json(msg='%s is required for rax_identity' % arg)
instance = dict( instance = dict(
authenticated=identity.authenticated, authenticated=identity.authenticated,
credentials=identity._creds_file credentials=identity._creds_file
@ -79,7 +75,7 @@ def main():
argument_spec = rax_argument_spec() argument_spec = rax_argument_spec()
argument_spec.update( argument_spec.update(
dict( dict(
state=dict(default='present', choices=['present', 'absent']) state=dict(default='present', choices=['present'])
) )
) )
@ -95,7 +91,7 @@ def main():
setup_rax_module(module, pyrax) setup_rax_module(module, pyrax)
if pyrax.identity is None: if not pyrax.identity:
module.fail_json(msg='Failed to instantiate client. This ' module.fail_json(msg='Failed to instantiate client. This '
'typically indicates an invalid region or an ' 'typically indicates an invalid region or an '
'incorrectly capitalized region name.') 'incorrectly capitalized region name.')
@ -106,5 +102,5 @@ def main():
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.rax import * from ansible.module_utils.rax import *
### invoke the module # invoke the module
main() main()