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

Merge pull request #4682 from wenottingham/subs-corner-cases

Browse Source 
Use the exported count in the manifest for the node count, if present.
This commit is contained in:
Ryan Petrello
2020-11-11 13:13:01 -05:00
committed by GitHub
parent a65008f762 a092406543
commit ddd109059f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,10 @@ class Licenser(object):
# Parse output for subscription metadata to build config # Parse output for subscription metadata to build config
license = dict() license = dict()
license['sku'] = manifest['pool']['productId'] license['sku'] = manifest['pool']['productId']
license['instance_count'] = manifest['pool']['quantity'] try:
license['instance_count'] = manifest['pool']['exported']
except KeyError:
license['instance_count'] = manifest['pool']['quantity']
license['subscription_name'] = manifest['pool']['productName'] license['subscription_name'] = manifest['pool']['productName']
license['pool_id'] = manifest['pool']['id'] license['pool_id'] = manifest['pool']['id']
license['license_date'] = parse_date(manifest['endDate']).strftime('%s') license['license_date'] = parse_date(manifest['endDate']).strftime('%s')