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

Fix trial status and host limit with sub (#14237)

Browse Source 
Co-authored-by: Lucas Benedito <lbenedit@redhat.com>
This commit is contained in:
lucas-benedito
2023-08-02 10:27:20 -04:00
committed by GitHub
co-authored by Lucas Benedito
parent 601b62deef
commit 6d1c8de4ed
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/access.py
+1 -1
View File
@@ -366,7 +366,7 @@ class BaseAccess(object):
report_violation = lambda message: None report_violation = lambda message: None
else: else:
report_violation = lambda message: logger.warning(message) 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 def report_violation(message): # noqa
raise PermissionDenied(message) raise PermissionDenied(message)
awx/main/utils/licensing.py
+5
View File
@@ -175,6 +175,11 @@ class Licenser(object):
license.setdefault('pool_id', sub['pool']['id']) license.setdefault('pool_id', sub['pool']['id'])
license.setdefault('product_name', sub['pool']['productName']) license.setdefault('product_name', sub['pool']['productName'])
license.setdefault('valid_key', True) license.setdefault('valid_key', True)
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('license_type', 'enterprise')
license.setdefault('satellite', False) license.setdefault('satellite', False)
# Use the nearest end date # Use the nearest end date