External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 15:57:52 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix to not require explicit port specification in REST_API_URL.

Browse Source
This commit is contained in:
Chris Church
2013-06-28 05:54:05 -04:00
parent ffa48f2c9e
commit 395685b23b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/plugins/callback/job_event_callback.py
View File

@@ -93,8 +93,9 @@ class CallbackModule(object):
auth = TokenAuth(self.auth_token) auth = TokenAuth(self.auth_token)
else: else:
auth = None auth = None
port = parts.port or (443 if parts.scheme == 'https' else 80)
url = urlparse.urlunsplit([parts.scheme, url = urlparse.urlunsplit([parts.scheme,
'%s:%d' % (parts.hostname, parts.port), '%s:%d' % (parts.hostname, port),
parts.path, parts.query, parts.fragment]) parts.path, parts.query, parts.fragment])
url_path = '/api/v1/jobs/%d/job_events/' % self.job_id url_path = '/api/v1/jobs/%d/job_events/' % self.job_id
url = urlparse.urljoin(url, url_path) url = urlparse.urljoin(url, url_path)

3
awx/scripts/inventory.py
View File

@@ -71,8 +71,9 @@ class InventoryScript(object):
auth = TokenAuth(self.auth_token) auth = TokenAuth(self.auth_token)
else: else:
auth = None auth = None
port = parts.port or (443 if parts.scheme == 'https' else 80)
url = urlparse.urlunsplit([parts.scheme, url = urlparse.urlunsplit([parts.scheme,
'%s:%d' % (parts.hostname, parts.port), '%s:%d' % (parts.hostname, port),
parts.path, parts.query, parts.fragment]) parts.path, parts.query, parts.fragment])
url_path = '/api/v1/inventories/%d/script/' % self.inventory_id url_path = '/api/v1/inventories/%d/script/' % self.inventory_id
if self.hostname: if self.hostname: