zuul
/
zuul
Code Issues Proposed changes

Ansible launcher: use console.html 

Some of our tooling expects console.html; the easiest thing to do
at this point is just to call it that everywhere.

Change-Id: I2ac3d03bf7e263e4f30d6f0d94974f1699ec8f24
This commit is contained in:
James E. Blair 2016-05-25 17:42:38 -07:00
parent 67791bd731
commit 42465ee3ff
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/ansible/library/zuul_console.py
View File

@ -170,14 +170,14 @@ class Server(object):
def test():
s = Server('/tmp/console.txt', 8088)
s = Server('/tmp/console.html', 8088)
s.run()
def main():
module = AnsibleModule(
argument_spec=dict(
path=dict(default='/tmp/console.txt'),
path=dict(default='/tmp/console.html'),
port=dict(default=8088, type='int'),
)
)

2
zuul/ansible/library/zuul_log.py
View File

@ -21,7 +21,7 @@ import datetime
class Console(object):
def __enter__(self):
self.logfile = open('/tmp/console.txt', 'a', 0)
self.logfile = open('/tmp/console.html', 'a', 0)
return self
def __exit__(self, etype, value, tb):

2
zuul/ansible/library/zuul_runner.py
View File

@ -23,7 +23,7 @@ import subprocess
class Console(object):
def __enter__(self):
self.logfile = open('/tmp/console.txt', 'a', 0)
self.logfile = open('/tmp/console.html', 'a', 0)
return self
def __exit__(self, etype, value, tb):

6
zuul/launcher/ansiblelaunchserver.py
View File

@ -608,7 +608,7 @@ class NodeWorker(object):
raise Exception("Undefined SCP site: %s" % (site,))
site = self.sites[site]
if scpfile.get('copy-console'):
src = '/tmp/console.txt'
src = '/tmp/console.html'
rsync_opts = []
else:
src = parameters['WORKSPACE']
@ -774,10 +774,10 @@ class NodeWorker(object):
tasks.append(dict(block=main_block,
rescue=error_block))
task = dict(file=dict(path='/tmp/console.txt', state='absent'))
task = dict(file=dict(path='/tmp/console.html', state='absent'))
main_block.append(task)
task = dict(zuul_console=dict(path='/tmp/console.txt', port=8088))
task = dict(zuul_console=dict(path='/tmp/console.html', port=8088))
main_block.append(task)
task = dict(file=dict(path=parameters['WORKSPACE'],