starlingx
/
config
Code Issues Proposed changes

Merge "Update verify-license call in sysinv"

This commit is contained in:
Zuul 2020-04-20 18:22:27 +00:00 committed by Gerrit Code Review
parent 93b55a2d4d 4247ed2fde
commit f2dd994914
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysinv/sysinv/sysinv/sysinv/common/health.py
View File

@ -156,14 +156,10 @@ class Health(object):
"""Validates the current license is valid for the specified version"""
check_binary = "/usr/bin/verify-license"
license_file = '/etc/platform/.license'
system = self._dbapi.isystem_get_one()
system_type = system.system_type
system_mode = system.system_mode
with open(os.devnull, "w") as fnull:
try:
subprocess.check_call([check_binary, license_file, version,
system_type, system_mode],
subprocess.check_call([check_binary, license_file, version],
stdout=fnull, stderr=fnull)
except subprocess.CalledProcessError:
return False