zuul
/
nodepool
Code Issues Proposed changes

Merge "Improve static provider to check non-ssh hosts"

This commit is contained in:
Zuul 2018-09-07 14:32:22 +00:00 committed by Gerrit Code Review
parent cf744d2e05 55e70f7636
commit 7ea2eec47a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodepool/driver/static/provider.py
View File

@ -36,18 +36,22 @@ class StaticNodeProvider(Provider):
self.static_nodes = {}
def checkHost(self, node):
# Check node is reachable
if node["connection-type"] != "ssh":
return
'''Check node is reachable'''
# only gather host keys if the connection type is ssh
gather_hostkeys = node["connection-type"] == 'ssh'
try:
keys = nodeutils.nodescan(node["name"],
port=node["connection-port"],
timeout=node["timeout"])
timeout=node["timeout"],
gather_hostkeys=gather_hostkeys)
except exceptions.ConnectionTimeoutException:
raise StaticNodeError(
"%s:%s: ConnectionTimeoutException" % (
node["name"], node["connection-port"]))
if not gather_hostkeys:
return
# Check node host-key
if set(node["host-key"]).issubset(set(keys)):
return keys