External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 14:39:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8770 from rooftopcellist/sat_include_port

Browse Source 
Read in and use the Sat port if applicable for Subscriptions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-07 21:41:41 +00:00
committed by GitHub
parent ea8ebe8a9f aa7514a993
commit 4992fed5a3
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/utils/licensing.py
View File

@@ -260,11 +260,15 @@ class Licenser(object):
def get_satellite_subs(self, host, user, pw): def get_satellite_subs(self, host, user, pw):
port = None
try: try:
verify = str(self.config.get("rhsm", "repo_ca_cert")) verify = str(self.config.get("rhsm", "repo_ca_cert"))
port = str(self.config.get("server", "port"))
except Exception as e: except Exception as e:
logger.exception('Unable to read rhsm config to get ca_cert location. {}'.format(str(e))) logger.exception('Unable to read rhsm config to get ca_cert location. {}'.format(str(e)))
verify = getattr(settings, 'REDHAT_CANDLEPIN_VERIFY', True) verify = getattr(settings, 'REDHAT_CANDLEPIN_VERIFY', True)
if port:
host = ':'.join([host, port])
json = [] json = []
try: try:
orgs = requests.get( orgs = requests.get(