Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug in DigitalOcean module_util #36352

Merged
merged 1 commit into from
Feb 18, 2018
Merged

Fix bug in DigitalOcean module_util #36352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions lib/ansible/module_utils/digital_ocean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,15 @@ class DigitalOceanHelper:
def __init__(self, module):
self.module = module
self.baseurl = 'https://api.digitalocean.com/v2'
self.oauth_token = None
self.timeout = module.params.get('timeout', 30)
self.oauth_token = module.params.get('oauth_token')
self.headers = {'Authorization': 'Bearer {0}'.format(self.oauth_token),
'Content-type': 'application/json'}

# Check if api_token is valid or not
response = self.get('account')
if response.status_code == 401:
module.fail_json(msg='Failed to login using API token, please verify validity of API token.')

self.timeout = module.params.get('timeout', 30)
self.module.fail_json(msg='Failed to login using API token, please verify validity of API token.')

def _url_builder(self, path):
if path[0] == '/':
Expand Down
2 changes: 0 additions & 2 deletions test/sanity/validate-modules/ignore.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,11 +670,9 @@ lib/ansible/modules/cloud/digital_ocean/digital_ocean.py E326
lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip.py E322
lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip.py E324
lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip.py E325
lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip_facts.py E325
lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey.py E322
lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey.py E324
lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey.py E325
lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py E325
lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py E325
lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py E326
lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py E324
Expand Down