X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/19a2e9a97939126293ce33d72f576f6f54da574f..1f8d81d0eeda07c3cedcaad3e942ec8dedd461cb:/services/nodemanager/arvnodeman/computenode/driver/__init__.py diff --git a/services/nodemanager/arvnodeman/computenode/driver/__init__.py b/services/nodemanager/arvnodeman/computenode/driver/__init__.py index e3298a70fa..14e804f385 100644 --- a/services/nodemanager/arvnodeman/computenode/driver/__init__.py +++ b/services/nodemanager/arvnodeman/computenode/driver/__init__.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, print_function from operator import attrgetter import libcloud.common.types as cloud_types -from libcloud.compute.base import NodeDriver +from libcloud.compute.base import NodeDriver, NodeAuthSSHKey from ...config import NETWORK_ERRORS @@ -58,7 +58,7 @@ class BaseComputeNodeDriver(object): def _init_ssh_key(self, filename): with open(filename) as ssh_file: - key = cloud_base.NodeAuthSSHKey(ssh_file.read()) + key = NodeAuthSSHKey(ssh_file.read()) return 'auth', key def search_for(self, term, list_method, key=attrgetter('id'), **kwargs): @@ -103,6 +103,10 @@ class BaseComputeNodeDriver(object): """ raise NotImplementedError("BaseComputeNodeDriver.arvados_create_kwargs") + def broken(self, cloud_node): + """Return true if libcloud has indicated the node is in a "broken" state.""" + return False + def _make_ping_url(self, arvados_node): return 'https://{}/arvados/v1/nodes/{}/ping?ping_secret={}'.format( self.ping_host, arvados_node['uuid'],