X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f0fe7273c1851cb93e9edd58c0b60d3590b222ed..907343b7176738987b26b542664578ee0d8b23f1:/services/nodemanager/arvnodeman/computenode/driver/ec2.py diff --git a/services/nodemanager/arvnodeman/computenode/driver/ec2.py b/services/nodemanager/arvnodeman/computenode/driver/ec2.py index 9db3d89cb6..6afe3163c9 100644 --- a/services/nodemanager/arvnodeman/computenode/driver/ec2.py +++ b/services/nodemanager/arvnodeman/computenode/driver/ec2.py @@ -64,11 +64,6 @@ class ComputeNodeDriver(BaseComputeNodeDriver): def _init_subnet_id(self, subnet_id): return 'ex_subnet', self.search_for(subnet_id, 'ex_list_subnets') - def _init_ssh_key(self, filename): - with open(filename) as ssh_file: - key = cloud_base.NodeAuthSSHKey(ssh_file.read()) - return 'auth', key - def arvados_create_kwargs(self, arvados_node): return {'name': arvados_node_fqdn(arvados_node), 'ex_userdata': self._make_ping_url(arvados_node)} @@ -80,6 +75,10 @@ class ComputeNodeDriver(BaseComputeNodeDriver): self.real.ex_create_tags(cloud_node, {'Name': arvados_node_fqdn(arvados_node)}) + @classmethod + def node_fqdn(cls, node): + return node.name + @classmethod def node_start_time(cls, node): time_str = node.extra['launch_time'].split('.', 2)[0] + 'UTC'