From cb861934591bce012c310337106c14272317773e Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Thu, 22 Oct 2020 13:33:10 -0400 Subject: [PATCH] Fallback to RH Candlepin Verify setting for OCP --- awx/main/utils/licensing.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/utils/licensing.py b/awx/main/utils/licensing.py index 7b7318503f..3a1df01096 100644 --- a/awx/main/utils/licensing.py +++ b/awx/main/utils/licensing.py @@ -175,7 +175,7 @@ class Licenser(object): def get_rhsm_subs(self, host, user, pw): - verify = getattr(settings, 'REDHAT_CANDLEPIN_VERIFY', False) + verify = getattr(settings, 'REDHAT_CANDLEPIN_VERIFY', True) json = [] try: subs = requests.get( @@ -207,7 +207,8 @@ class Licenser(object): try: verify = str(self.config.get("rhsm", "repo_ca_cert")) 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 = [] try: orgs = requests.get(