From ff6dd45cbc4133176f18092c9fc2bef2734286a3 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 16 Jun 2016 17:17:35 -0700 Subject: [PATCH] Ansible launcher: Use port 19885 for console streaming Thanks Jay! Change-Id: Ie67bbba02dbf61a481f66001de3e0dede9448316 Closes-Bug: 1590139 --- zuul/ansible/library/zuul_console.py | 4 ++-- zuul/launcher/ansiblelaunchserver.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zuul/ansible/library/zuul_console.py b/zuul/ansible/library/zuul_console.py index 78f3249c88..1186235a78 100644 --- a/zuul/ansible/library/zuul_console.py +++ b/zuul/ansible/library/zuul_console.py @@ -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'), ) ) diff --git a/zuul/launcher/ansiblelaunchserver.py b/zuul/launcher/ansiblelaunchserver.py index 2b76e0d7ba..925afa0998 100644 --- a/zuul/launcher/ansiblelaunchserver.py +++ b/zuul/launcher/ansiblelaunchserver.py @@ -818,7 +818,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) @@ -1107,7 +1107,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'],