shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Change use of subprocess lib for calculating system capacity

Browse Source 
Suggested by Ryan Petrello as a part of the PR feedback
for the isolated instance setup work.
This commit is contained in:
AlanCoding 2017-06-19 12:05:26 -04:00
parent 1d9f2be0e4
commit 7eb8fdd0f1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/lib/management_modules/tower_capacity.py
View File

@ -25,8 +25,11 @@ def main():
argument_spec = dict()
)
# Duplicated with awx.main.utils.common.get_system_task_capacity
proc = subprocess.Popen(['free', '-m'], stdout=subprocess.PIPE)
out,err = proc.communicate()
try:
out = subprocess.check_output(['free', '-m'])
except subprocess.CalledProcessError as e:
module.fail_json(msg=str(e))
return
total_mem_value = out.split()[7]
if int(total_mem_value) <= 2048:
cap = 50

7
awx/main/utils/common.py
View File

@ -543,8 +543,11 @@ def get_system_task_capacity():
from django.conf import settings
if hasattr(settings, 'SYSTEM_TASK_CAPACITY'):
return settings.SYSTEM_TASK_CAPACITY
proc = subprocess.Popen(['free', '-m'], stdout=subprocess.PIPE)
out,err = proc.communicate()
try:
out = subprocess.check_output(['free', '-m'])
except subprocess.CalledProcessError as e:
logger.error('Problem obtaining capacity from system, error:\n{}'.format(str(e)))
return 0
total_mem_value = out.split()[7]
if int(total_mem_value) <= 2048:
return 50