Skip to content

Commit

Permalink
Merge branch 'master' of github.com:cloudify-incubator/cloudify-ansib…
Browse files Browse the repository at this point in the history
…le-tower-plugin
  • Loading branch information
jakubcierlik committed Apr 14, 2022
2 parents 5cde3cc + 9d60919 commit e415195
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cloudify_ansible_tower/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def get_session_connection(self):
)))
# SSL Verification
if not self.creds.endpoint.startswith('http://'):
requests.verify = self.creds.endpoint_verify
session.verify = self.creds.endpoint_verify
# Set the API access token for the session
session.headers = {
'Authorization': 'Bearer {0}'.format(
Expand Down
3 changes: 2 additions & 1 deletion cloudify_ansible_tower/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def get_credentials(_ctx=ctx):
"""
cred_keys = ['endpoint', 'endpoint_verify', 'access_token']
props = _ctx.node.properties.get('client_config')
properties = {k: props[k] for k in cred_keys if props.get(k)}
properties = {
k: props[k] for k in cred_keys if props.get(k) is not None }
return APICredentials(**properties)


Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
description='Cloudify plugin for Ansible Tower / AWX',
install_requires=[
'cloudify-common==5.0.5.1',
'cloudify-common>=4.5',
'requests~=2.23.0'
]
)

0 comments on commit e415195

Please sign in to comment.