opendev/system-config
Code Issues Proposed changes

Merge "launch: Use popen rather than check_output"

Browse Source
This commit is contained in:
Jenkins 2016-09-15 22:41:30 +00:00 committed by Gerrit Code Review
commit 2d0f60a3dd
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
launch/launch-node.py
View File

@ -68,6 +68,23 @@ class JobDir(object):
shutil.rmtree(self.root) shutil.rmtree(self.root)
def run(cmd, **args):
args['stdout'] = subprocess.PIPE
args['stderr'] = subprocess.STDOUT
print "Running: %s" % (cmd,)
proc = subprocess.Popen(cmd, **args)
out = ''
for line in iter(proc.stdout.readline, ''):
sys.stdout.write(line)
sys.stdout.flush()
out += line
ret = proc.wait()
print "Return code: %s" % (ret,)
if ret != 0:
raise subprocess.CalledProcessError(ret, cmd, out)
return ret
def bootstrap_server(server, key, name, volume_device, keep, def bootstrap_server(server, key, name, volume_device, keep,
mount_path, fs_label): mount_path, fs_label):
@ -137,20 +154,16 @@ def bootstrap_server(server, key, name, volume_device, keep,
# Regenerate inventory cache, throwing an error if there is an issue # Regenerate inventory cache, throwing an error if there is an issue
# so that we don't generate a bogus groups file # so that we don't generate a bogus groups file
try: try:
subprocess.check_output( run(['/etc/ansible/hosts/openstack', '--list'],
['/etc/ansible/hosts/openstack', '--list'],
env=expand_env) env=expand_env)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print "Inventory regeneration failed" print "Inventory regeneration failed"
print e.output print e.output
raise raise
print "--- Running /usr/local/bin/expand-groups.sh ---" run('/usr/local/bin/expand-groups.sh',
print subprocess.check_output(
'/usr/local/bin/expand-groups.sh',
env=expand_env, env=expand_env,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
print "--- done ---\n"
# Write out the private SSH key we generated # Write out the private SSH key we generated
with open(jobdir.key, 'w') as key_file: with open(jobdir.key, 'w') as key_file:
@ -176,22 +189,12 @@ def bootstrap_server(server, key, name, volume_device, keep,
# Run the remote puppet apply playbook limited to just this server # Run the remote puppet apply playbook limited to just this server
# we just created # we just created
try: for playbook in [
for playbook in [ 'set_hostnames.yml',
'set_hostnames.yml', 'remote_puppet_adhoc.yaml']:
'remote_puppet_adhoc.yaml']: run(ansible_cmd + [
print "--- Running : %s ---" % (ansible_cmd) os.path.join(SCRIPT_DIR, '..', 'playbooks', playbook)],
print subprocess.check_output( env=jobdir.env)
ansible_cmd + [
os.path.join(
SCRIPT_DIR, '..', 'playbooks', playbook)],
stderr=subprocess.STDOUT,
env=jobdir.env)
print "--- done ---\n"
except subprocess.CalledProcessError as e:
print "Subprocess failed"
print e.output
raise
try: try:
ssh_client.ssh("reboot") ssh_client.ssh("reboot")