Merge "Ansible launcher: Use port 19885 for console streaming"
This commit is contained in:
commit
c709b6adb7
|
@ -170,7 +170,7 @@ class Server(object):
|
||||||
|
|
||||||
|
|
||||||
def test():
|
def test():
|
||||||
s = Server('/tmp/console.html', 8088)
|
s = Server('/tmp/console.html', 19885)
|
||||||
s.run()
|
s.run()
|
||||||
|
|
||||||
|
|
||||||
|
@ -178,7 +178,7 @@ def main():
|
||||||
module = AnsibleModule(
|
module = AnsibleModule(
|
||||||
argument_spec=dict(
|
argument_spec=dict(
|
||||||
path=dict(default='/tmp/console.html'),
|
path=dict(default='/tmp/console.html'),
|
||||||
port=dict(default=8088, type='int'),
|
port=dict(default=19885, type='int'),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -889,7 +889,7 @@ class NodeWorker(object):
|
||||||
data = {
|
data = {
|
||||||
'manager': self.manager_name,
|
'manager': self.manager_name,
|
||||||
'number': job.unique,
|
'number': job.unique,
|
||||||
'url': 'telnet://%s:8088' % self.host,
|
'url': 'telnet://%s:19885' % self.host,
|
||||||
}
|
}
|
||||||
job.sendWorkData(json.dumps(data))
|
job.sendWorkData(json.dumps(data))
|
||||||
job.sendWorkStatus(0, 100)
|
job.sendWorkStatus(0, 100)
|
||||||
|
@ -1188,7 +1188,8 @@ class NodeWorker(object):
|
||||||
task = dict(file=dict(path='/tmp/console.html', state='absent'))
|
task = dict(file=dict(path='/tmp/console.html', state='absent'))
|
||||||
main_block.append(task)
|
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)
|
main_block.append(task)
|
||||||
|
|
||||||
task = dict(file=dict(path=parameters['WORKSPACE'],
|
task = dict(file=dict(path=parameters['WORKSPACE'],
|
||||||
|
|
Loading…
Reference in New Issue