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

Fallback to RH Candlepin Verify setting for OCP

Browse Source
This commit is contained in:
Christian M. Adams
2020-10-30 16:39:57 -04:00
committed by Ryan Petrello
parent 86d0ee590f
commit cb86193459
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/utils/licensing.py
+3 -2
View File
@@ -175,7 +175,7 @@ class Licenser(object):
def get_rhsm_subs(self, host, user, pw): def get_rhsm_subs(self, host, user, pw):
verify = getattr(settings, 'REDHAT_CANDLEPIN_VERIFY', False) verify = getattr(settings, 'REDHAT_CANDLEPIN_VERIFY', True)
json = [] json = []
try: try:
subs = requests.get( subs = requests.get(
@@ -207,7 +207,8 @@ class Licenser(object):
try: try:
verify = str(self.config.get("rhsm", "repo_ca_cert")) verify = str(self.config.get("rhsm", "repo_ca_cert"))
except Exception as e: except Exception as e:
raise OSError('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)
json = [] json = []
try: try:
orgs = requests.get( orgs = requests.get(