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

fix incorrect detection of license on inventory updates

Browse Source
This commit is contained in:
Ryan Petrello
2020-10-22 16:07:13 -04:00
parent 05de875ace
commit 0ddf47740c
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/management/commands/inventory_import.py
View File

@@ -903,7 +903,7 @@ class Command(BaseCommand):
def check_license(self): def check_license(self):
license_info = get_licenser().validate() license_info = get_licenser().validate()
local_license_type = license_info.get('license_type', 'UNLICENSED') local_license_type = license_info.get('license_type', 'UNLICENSED')
if license_info.get('license_key', 'UNLICENSED') == 'UNLICENSED': if local_license_type == 'UNLICENSED':
logger.error(LICENSE_NON_EXISTANT_MESSAGE) logger.error(LICENSE_NON_EXISTANT_MESSAGE)
raise CommandError('No license found!') raise CommandError('No license found!')
elif local_license_type == 'open': elif local_license_type == 'open':

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

@@ -99,8 +99,6 @@ class Licenser(object):
kwargs.pop('company_name') kwargs.pop('company_name')
self._attrs.update(kwargs) self._attrs.update(kwargs)
if os.path.exists('/var/lib/awx/.tower_version'): if os.path.exists('/var/lib/awx/.tower_version'):
if 'license_key' in self._attrs:
self._unset_attrs()
if 'valid_key' in self._attrs: if 'valid_key' in self._attrs:
if not self._attrs['valid_key']: if not self._attrs['valid_key']:
self._unset_attrs() self._unset_attrs()