internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-08-01 20:34:41 +00:00
Code Issues Projects Releases Wiki Activity

ansible-ipa-*-install: Get continuous output working for python2 also

Browse Source 
The used code for continuous output from the ansible-playbook call was
only working for Python2. The output has only been printed when the command
finised. This code has been replaced with code that is working with Python2
and Python3.
This commit is contained in:
Thomas Woerner
2019-07-29 13:03:24 +02:00
parent 781ac6e90b
commit ab25078b47
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/ansible-ipa-client-install
View File

@@ -227,9 +227,11 @@ def run_cmd(args):
p = subprocess.Popen(args, stdout=p_out, stderr=p_err, p = subprocess.Popen(args, stdout=p_out, stderr=p_err,
close_fds=True, bufsize=1, close_fds=True, bufsize=1,
universal_newlines=True) universal_newlines=True)
with p.stdout: while True:
for line in p.stdout: line = p.stdout.readline()
sys.stdout.write(line) if p.poll() is not None and line == "":
break
sys.stdout.write(line)
except KeyboardInterrupt: except KeyboardInterrupt:
p.wait() p.wait()
raise raise

8
utils/ansible-ipa-replica-install
View File

@@ -295,9 +295,11 @@ def run_cmd(args):
p = subprocess.Popen(args, stdout=p_out, stderr=p_err, p = subprocess.Popen(args, stdout=p_out, stderr=p_err,
close_fds=True, bufsize=1, close_fds=True, bufsize=1,
universal_newlines=True) universal_newlines=True)
with p.stdout: while True:
for line in p.stdout: line = p.stdout.readline()
sys.stdout.write(line) if p.poll() is not None and line == "":
break
sys.stdout.write(line)
except KeyboardInterrupt: except KeyboardInterrupt:
p.wait() p.wait()
raise raise

8
utils/ansible-ipa-server-install
View File

@@ -331,9 +331,11 @@ def run_cmd(args):
p = subprocess.Popen(args, stdout=p_out, stderr=p_err, p = subprocess.Popen(args, stdout=p_out, stderr=p_err,
close_fds=True, bufsize=1, close_fds=True, bufsize=1,
universal_newlines=True) universal_newlines=True)
with p.stdout: while True:
for line in p.stdout: line = p.stdout.readline()
sys.stdout.write(line) if p.poll() is not None and line == "":
break
sys.stdout.write(line)
except KeyboardInterrupt: except KeyboardInterrupt:
p.wait() p.wait()
raise raise