openstack
/
heat-agents
Code Issues Proposed changes

Refactor docker invocation into function 

This will be useful later when many docker calls are made to
introspect currently running containers.

Change-Id: Id2b0a74c974b2844b21061fb54b498bf88c50435
This commit is contained in:
Steve Baker 2017-01-30 01:44:34 +00:00
parent 301db11253
commit 2a230b2c6e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
heat-config-docker-cmd/install.d/hook-docker-cmd.py
View File

@ -49,6 +49,16 @@ def docker_arg_map(key, value):
}.get(key, None)
def execute(cmd):
log.debug(' '.join(cmd))
subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
cmd_stdout, cmd_stderr = subproc.communicate()
log.debug(cmd_stdout)
log.debug(cmd_stderr)
return cmd_stdout, cmd_stderr, subproc.returncode
def main(argv=sys.argv):
global log
log = logging.getLogger('heat-config')
@ -124,25 +134,15 @@ def main(argv=sys.argv):
if 'command' in config[container]:
cmd.extend(config[container].get('command'))
log.debug(' '.join(cmd))
subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
cmd_stdout, cmd_stderr = subproc.communicate()
log.debug(cmd_stdout)
log.debug(cmd_stderr)
(cmd_stdout, cmd_stderr, returncode) = execute(cmd)
if cmd_stdout:
stdout.append(cmd_stdout)
if cmd_stderr:
stderr.append(cmd_stderr)
if subproc.returncode:
log.error("Error running %s. [%s]\n" % (cmd, subproc.returncode))
else:
log.debug('Completed %s' % cmd)
if subproc.returncode not in exit_codes:
log.error("Error running %s. [%s]\n" % (cmd, subproc.returncode))
deploy_status_code = subproc.returncode
if returncode not in exit_codes:
log.error("Error running %s. [%s]\n" % (cmd, returncode))
deploy_status_code = returncode
else:
log.debug('Completed %s' % cmd)