openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Address python3 string issues with subprocess"

This commit is contained in:
Zuul 2019-01-24 00:36:38 +00:00 committed by Gerrit Code Review
parent 63a657d2f4 a619d990c0
commit d385118e8d
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/docker-puppet.py
View File

@ -102,8 +102,9 @@ def short_hostname():
def pull_image(name): def pull_image(name):
subproc = subprocess.Popen([cli_cmd, 'inspect', name], subproc = subprocess.Popen([cli_cmd, 'inspect', name],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
cmd_stdout, cmd_stderr = subproc.communicate() cmd_stdout, cmd_stderr = subproc.communicate()
retval = subproc.returncode retval = subproc.returncode
if retval == 0: if retval == 0:
@ -117,7 +118,8 @@ def pull_image(name):
count += 1 count += 1
subproc = subprocess.Popen([cli_cmd, 'pull', name], subproc = subprocess.Popen([cli_cmd, 'pull', name],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
cmd_stdout, cmd_stderr = subproc.communicate() cmd_stdout, cmd_stderr = subproc.communicate()
retval = subproc.returncode retval = subproc.returncode
@ -162,7 +164,8 @@ def rm_container(name):
log.info('Diffing container: %s' % name) log.info('Diffing container: %s' % name)
subproc = subprocess.Popen([cli_cmd, 'diff', name], subproc = subprocess.Popen([cli_cmd, 'diff', name],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
cmd_stdout, cmd_stderr = subproc.communicate() cmd_stdout, cmd_stderr = subproc.communicate()
if cmd_stdout: if cmd_stdout:
log.debug(cmd_stdout) log.debug(cmd_stdout)
@ -172,7 +175,8 @@ def rm_container(name):
log.info('Removing container: %s' % name) log.info('Removing container: %s' % name)
subproc = subprocess.Popen([cli_cmd, 'rm', name], subproc = subprocess.Popen([cli_cmd, 'rm', name],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
cmd_stdout, cmd_stderr = subproc.communicate() cmd_stdout, cmd_stderr = subproc.communicate()
if cmd_stdout: if cmd_stdout:
log.debug(cmd_stdout) log.debug(cmd_stdout)
@ -462,7 +466,8 @@ def mp_puppet_config(*args):
cmd = [cli_cmd, 'start', '-a', uname] cmd = [cli_cmd, 'start', '-a', uname]
count += 1 count += 1
subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE, subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=env) stderr=subprocess.PIPE, env=env,
universal_newlines=True)
cmd_stdout, cmd_stderr = subproc.communicate() cmd_stdout, cmd_stderr = subproc.communicate()
retval = subproc.returncode retval = subproc.returncode
# puppet with --detailed-exitcodes will return 0 for success and no changes # puppet with --detailed-exitcodes will return 0 for success and no changes

2
tools/merge-new-params-nic-config-script.py
View File

@ -200,7 +200,7 @@ def process_templates_and_get_reference_parameters():
'--network-data ' + OPTS.network_data, '--network-data ' + OPTS.network_data,
'--output-dir ' + temp_dir] '--output-dir ' + temp_dir]
child = subprocess.Popen(' '.join(cmd), shell=True, stdout=subprocess.PIPE, child = subprocess.Popen(' '.join(cmd), shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE, universal_newlines=True)
out, err = child.communicate() out, err = child.communicate()
if not child.returncode == 0: if not child.returncode == 0:
raise RuntimeError('Error processing templates: %s' % err) raise RuntimeError('Error processing templates: %s' % err)