Browse Source

Rename ssh_port to connection_port

With the upcoming windows support we don't have ssh as the only
connection type. As a preparation for this generalize ssh_port to
connection_port.

Change-Id: Ie505fedea7b641a860b7ac4f834d96ce5351dd74
Depends-On: Ic1939054f0604411e0122db8dbd7e9886ceaa974
changes/99/500799/8
Tobias Henkel 5 years ago
parent
commit
aea43445b7
  1. 6
      tests/unit/test_executor.py
  2. 2
      zuul/executor/server.py
  3. 2
      zuul/model.py

6
tests/unit/test_executor.py

@ -416,15 +416,15 @@ class TestAnsibleJob(ZuulTestCase):
job)
def test_getHostList_host_keys(self):
# Test without ssh_port set
# Test without connection_port set
node = {'name': 'fake-host',
'host_keys': ['fake-host-key'],
'interface_ip': 'localhost'}
keys = self.test_job.getHostList({'nodes': [node]})[0]['host_keys']
self.assertEqual(keys[0], 'localhost fake-host-key')
# Test with custom ssh_port set
node['ssh_port'] = 22022
# Test with custom connection_port set
node['connection_port'] = 22022
keys = self.test_job.getHostList({'nodes': [node]})[0]['host_keys']
self.assertEqual(keys[0], '[localhost]:22022 fake-host-key')

2
zuul/executor/server.py

@ -911,7 +911,7 @@ class AnsibleJob(object):
# results in the wrong thing being in interface_ip
# TODO(jeblair): Move this notice to the docs.
ip = node.get('interface_ip')
port = node.get('ssh_port', 22)
port = node.get('connection_port', node.get('ssh_port', 22))
host_vars = dict(
ansible_host=ip,
ansible_user=self.executor_server.default_username,

2
zuul/model.py

@ -383,7 +383,7 @@ class Node(object):
self.public_ipv4 = None
self.private_ipv4 = None
self.public_ipv6 = None
self.ssh_port = 22
self.connection_port = 22
self._keys = []
self.az = None
self.provider = None

Loading…
Cancel
Save