From 395685b23ba6197d116b1d8378b15521adcaecb7 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Fri, 28 Jun 2013 05:54:05 -0400 Subject: [PATCH] Fix to not require explicit port specification in REST_API_URL. --- awx/plugins/callback/job_event_callback.py | 3 ++- awx/scripts/inventory.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/plugins/callback/job_event_callback.py b/awx/plugins/callback/job_event_callback.py index 4da7cdd789..e771dadef5 100644 --- a/awx/plugins/callback/job_event_callback.py +++ b/awx/plugins/callback/job_event_callback.py @@ -93,8 +93,9 @@ class CallbackModule(object): auth = TokenAuth(self.auth_token) else: auth = None + port = parts.port or (443 if parts.scheme == 'https' else 80) url = urlparse.urlunsplit([parts.scheme, - '%s:%d' % (parts.hostname, parts.port), + '%s:%d' % (parts.hostname, port), parts.path, parts.query, parts.fragment]) url_path = '/api/v1/jobs/%d/job_events/' % self.job_id url = urlparse.urljoin(url, url_path) diff --git a/awx/scripts/inventory.py b/awx/scripts/inventory.py index d864250b1a..e297ce3f21 100755 --- a/awx/scripts/inventory.py +++ b/awx/scripts/inventory.py @@ -71,8 +71,9 @@ class InventoryScript(object): auth = TokenAuth(self.auth_token) else: auth = None + port = parts.port or (443 if parts.scheme == 'https' else 80) url = urlparse.urlunsplit([parts.scheme, - '%s:%d' % (parts.hostname, parts.port), + '%s:%d' % (parts.hostname, port), parts.path, parts.query, parts.fragment]) url_path = '/api/v1/inventories/%d/script/' % self.inventory_id if self.hostname: