ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #5028 from retr0h/correct-nova-api-auth-check

Browse source 
Nova doesn't attempt to auth on obj instantiation
This commit is contained in:
jctanner 2013-12-13 08:36:27 -08:00
commit 66cad764d2
2 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/cloud/nova_compute
View file

@ -2,6 +2,7 @@
#coding: utf-8 -*- #coding: utf-8 -*-
# (c) 2013, Benno Joy <benno@ansibleworks.com> # (c) 2013, Benno Joy <benno@ansibleworks.com>
# (c) 2013, John Dewey <john@dewey.ws>
# #
# This module is free software: you can redistribute it and/or modify # This module is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -18,6 +19,7 @@
try: try:
from novaclient.v1_1 import client as nova_client from novaclient.v1_1 import client as nova_client
from novaclient import exceptions
import time import time
except ImportError: except ImportError:
print("failed=True msg='novaclient is required for this module'") print("failed=True msg='novaclient is required for this module'")
@ -229,14 +231,18 @@ def main():
), ),
) )
try: nova = nova_client.Client(module.params['login_username'],
nova = nova_client.Client( module.params['login_username'],
module.params['login_password'], module.params['login_password'],
module.params['login_tenant_name'], module.params['login_tenant_name'],
module.params['auth_url'], module.params['auth_url'],
service_type='compute') service_type='compute')
except Exception as e: try:
module.fail_json( msg = "Error in authenticating to nova: %s" % e.message) nova.authenticate()
except exc.Unauthorized as e:
module.fail_json(msg = "Invalid OpenStack Nova credentials.: %s" % e.message)
except exc.AuthorizationFailure as e:
module.fail_json(msg = "Unable to authorize user: %s" % e.message)
if module.params['state'] == 'present': if module.params['state'] == 'present':
if not module.params['image_id']: if not module.params['image_id']:
module.fail_json( msg = "Parameter 'image_id' is required if state == 'present'") module.fail_json( msg = "Parameter 'image_id' is required if state == 'present'")

17
library/cloud/nova_keypair
View file

@ -2,6 +2,7 @@
#coding: utf-8 -*- #coding: utf-8 -*-
# (c) 2013, Benno Joy <benno@ansibleworks.com> # (c) 2013, Benno Joy <benno@ansibleworks.com>
# (c) 2013, John Dewey <john@dewey.ws>
# #
# This module is free software: you can redistribute it and/or modify # This module is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -18,6 +19,7 @@
try: try:
from novaclient.v1_1 import client from novaclient.v1_1 import client
from novaclient import exceptions
import time import time
except ImportError: except ImportError:
print("failed=True msg='novaclient is required for this module to work'") print("failed=True msg='novaclient is required for this module to work'")
@ -98,11 +100,18 @@ def main():
), ),
) )
nova = nova_client.Client(module.params['login_username'],
module.params['login_password'],
module.params['login_tenant_name'],
module.params['auth_url'],
service_type='compute')
try: try:
nova = client.Client(module.params['login_username'], module.params['login_password'], nova.authenticate()
module.params['login_tenant_name'], module.params['auth_url'], service_type='compute') except exc.Unauthorized as e:
except Exception as e: module.fail_json(msg = "Invalid OpenStack Nova credentials.: %s" % e.message)
module.fail_json( msg = " Error in authenticating to nova: %s" % e.message) except exc.AuthorizationFailure as e:
module.fail_json(msg = "Unable to authorize user: %s" % e.message)
if module.params['state'] == 'present': if module.params['state'] == 'present':
for key in nova.keypairs.list(): for key in nova.keypairs.list():
if key.name == module.params['name']: if key.name == module.params['name']: