starlingx
/
config
Code Issues Proposed changes

Merge "Update sysinv to handle newer version of python-docker"

This commit is contained in:
Zuul 2018-11-21 23:49:59 +00:00 committed by Gerrit Code Review
parent cf694b0502 72b708fdd7
commit 54fdc72026
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/kube_app.py
View File

@ -315,6 +315,7 @@ class KubeAppController(rest.RestController):
return KubeApp.convert_with_links(db_app)
else:
if db_app.status not in [constants.APP_APPLY_SUCCESS,
constants.APP_REMOVE_FAILURE,
constants.APP_APPLY_FAILURE]:
raise wsme.exc.ClientSideError(_(
"Application-remove rejected: operation is not allowed while "

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

@ -42,7 +42,6 @@ kube_app_opts = [
CONF = cfg.CONF
CONF.register_opts(kube_app_opts)
ARMADA_CONTAINER_NAME = 'armada_service'
ARMADA_ERRORS = ['ERROR', 'failed', 'timed out']
MAX_DOWNLOAD_THREAD = 20
@ -705,8 +704,8 @@ class DockerHelper(object):
if armada_svc:
if request == 'validate':
cmd = 'armada validate ' + manifest_file
exec_logs = armada_svc.exec_run(cmd)
if "Successfully validated" in exec_logs:
(exit_code, exec_logs) = armada_svc.exec_run(cmd)
if exit_code == 0:
LOG.info("Manifest file %s was successfully validated." %
manifest_file)
else:
@ -716,8 +715,8 @@ class DockerHelper(object):
elif request == 'apply':
cmd = 'armada apply --debug ' + manifest_file + overrides_str
LOG.info("Armada apply command = %s" % cmd)
exec_logs = armada_svc.exec_run(cmd)
if not any(str in exec_logs for str in ARMADA_ERRORS):
(exit_code, exec_logs) = armada_svc.exec_run(cmd)
if exit_code == 0:
LOG.info("Application manifest %s was successfully "
"applied/re-applied." % manifest_file)
else:
@ -726,8 +725,8 @@ class DockerHelper(object):
exec_logs)
elif request == 'delete':
cmd = 'armada delete --debug --manifest ' + manifest_file
exec_logs = armada_svc.exec_run(cmd)
if not any(str in exec_logs for str in ARMADA_ERRORS):
(exit_code, exec_logs) = armada_svc.exec_run(cmd)
if exit_code == 0:
LOG.info("Application charts were successfully "
"deleted.")
else: