diff --git a/awx/main/access.py b/awx/main/access.py index 277076d741..730c0decf7 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -366,7 +366,7 @@ class BaseAccess(object): report_violation = lambda message: None else: report_violation = lambda message: logger.warning(message) - if validation_info.get('trial', False) is True or validation_info['instance_count'] == 10: # basic 10 license + if validation_info.get('trial', False) is True: def report_violation(message): # noqa raise PermissionDenied(message) diff --git a/awx/main/utils/licensing.py b/awx/main/utils/licensing.py index b5e8957e32..8e621e1312 100644 --- a/awx/main/utils/licensing.py +++ b/awx/main/utils/licensing.py @@ -175,7 +175,12 @@ class Licenser(object): license.setdefault('pool_id', sub['pool']['id']) license.setdefault('product_name', sub['pool']['productName']) license.setdefault('valid_key', True) - license.setdefault('license_type', 'enterprise') + if sub['pool']['productId'].startswith('S'): + license.setdefault('trial', True) + license.setdefault('license_type', 'trial') + else: + license.setdefault('trial', False) + license.setdefault('license_type', 'enterprise') license.setdefault('satellite', False) # Use the nearest end date endDate = parse_date(sub['endDate'])