Merge "Correctly use connection-port in static driver"

This commit is contained in:
Zuul 2018-06-11 14:22:09 +00:00 committed by Gerrit Code Review
commit 879ed2407e

View File

@ -78,7 +78,7 @@ class StaticProviderConfig(ProviderConfig):
'timeout': int(node.get('timeout', 5)),
# Read ssh-port values for backward compat, but prefer port
'connection-port': int(
node.get('port', node.get('ssh-port', 22))),
node.get('connection-port', node.get('ssh-port', 22))),
'connection-type': node.get('connection-type', 'ssh'),
'username': node.get('username', 'zuul'),
'max-parallel-jobs': int(node.get('max-parallel-jobs', 1)),