Merge "Ansible launcher: Use port 19885 for console streaming"
diff --git a/zuul/ansible/library/zuul_console.py b/zuul/ansible/library/zuul_console.py
index 78f3249..1186235 100644
--- a/zuul/ansible/library/zuul_console.py
+++ b/zuul/ansible/library/zuul_console.py
@@ -170,7 +170,7 @@
def test():
- s = Server('/tmp/console.html', 8088)
+ s = Server('/tmp/console.html', 19885)
s.run()
@@ -178,7 +178,7 @@
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 7c7b0cf..f38c4af 100644
--- a/zuul/launcher/ansiblelaunchserver.py
+++ b/zuul/launcher/ansiblelaunchserver.py
@@ -889,7 +889,7 @@
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 @@
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'],