zuul
/
zuul
Code Issues Proposed changes

Merge "Ansible launcher: Use port 19885 for console streaming"

This commit is contained in:
Jenkins 2016-07-21 20:37:06 +00:00 committed by Gerrit Code Review
parent bc58ea3412 ff6dd45cbc
commit c709b6adb7
2 changed files with 5 additions and 4 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,7 +170,7 @@ class Server(object):
def test():
s = Server('/tmp/console.html', 8088)
s = Server('/tmp/console.html', 19885)
s.run()
@ -178,7 +178,7 @@ def main():
module = AnsibleModule(
argument_spec=dict(
path=dict(default='/tmp/console.html'),
port=dict(default=8088, type='int'),
port=dict(default=19885, type='int'),
)
)

5
zuul/launcher/ansiblelaunchserver.py
View File

@ -889,7 +889,7 @@ class NodeWorker(object):
data = {
'manager': self.manager_name,
'number': job.unique,
'url': 'telnet://%s:8088' % self.host,
'url': 'telnet://%s:19885' % self.host,
}
job.sendWorkData(json.dumps(data))
job.sendWorkStatus(0, 100)
@ -1188,7 +1188,8 @@ class NodeWorker(object):
task = dict(file=dict(path='/tmp/console.html', state='absent'))
main_block.append(task)
task = dict(zuul_console=dict(path='/tmp/console.html', port=8088))
task = dict(zuul_console=dict(path='/tmp/console.html',
port=19885))
main_block.append(task)
task = dict(file=dict(path=parameters['WORKSPACE'],