starlingx
/
config
Code Issues Proposed changes

Remove obsolete logs in application framework 

This commit removes logs that have been made obsolete by commit
3ad728ac6d.

Tests:
  - Upload, apply, update, remove, delete of a sample application.

Closes-Bug: 1818123
Change-Id: Ifa1a037a918b144a28799ac61743bc3f69772c63
Signed-off-by: Tee Ngo <Tee.Ngo@windriver.com>
This commit is contained in:
Tee Ngo 2019-07-04 23:44:12 -04:00
parent 0c16cd8b61
commit cfed685e55
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
View File

@ -1998,14 +1998,8 @@ class DockerHelper(object):
LOG.info("Armada apply command = %s" % cmd)
(exit_code, exec_logs) = armada_svc.exec_run(cmd)
if exit_code == 0:
if ARMADA_MANIFEST_APPLY_SUCCESS_MSG in exec_logs:
LOG.info("Application manifest %s was successfully "
"applied/re-applied." % manifest_file)
else:
rc = False
LOG.error("Received a false positive response from "
"Docker/Armada. Failed to apply application "
"manifest %s: %s." % (manifest_file, exec_logs))
LOG.info("Application manifest %s was successfully "
"applied/re-applied." % manifest_file)
else:
rc = False
if exit_code == CONTAINER_ABNORMAL_EXIT_CODE:
@ -2035,14 +2029,7 @@ class DockerHelper(object):
"--debug --release " + release + " --version " +\
str(version) + tiller_host + " | tee -a " + logfile + "'"
(exit_code, exec_logs) = armada_svc.exec_run(cmd)
if exit_code == 0:
if ARMADA_RELEASE_ROLLBACK_FAILURE_MSG in exec_logs:
rc = False
LOG.error("Received a false positive response from "
"Docker/Armada. Failed to rollback release "
"(%s): %s" % (release, exec_logs))
break
else:
if exit_code != 0:
rc = False
if exit_code == CONTAINER_ABNORMAL_EXIT_CODE:
LOG.error("Failed to rollback release (%s). "