projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8497-datamanager-batchsize-1000' of https://github.com/wtsi-hgi/arvados...
[arvados.git]
/
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 6afe3163c9cf89bb287ca3c0a904311345a36555..991a2983c7217f1a29368293513587d117d01d59 100644
(file)
--- a/
services/nodemanager/arvnodeman/computenode/driver/ec2.py
+++ b/
services/nodemanager/arvnodeman/computenode/driver/ec2.py
@@
-64,7
+64,7
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
def _init_subnet_id(self, subnet_id):
return 'ex_subnet', self.search_for(subnet_id, 'ex_list_subnets')
def _init_subnet_id(self, subnet_id):
return 'ex_subnet', self.search_for(subnet_id, 'ex_list_subnets')
- def arvados_create_kwargs(self, arvados_node):
+ def arvados_create_kwargs(self,
size,
arvados_node):
return {'name': arvados_node_fqdn(arvados_node),
'ex_userdata': self._make_ping_url(arvados_node)}
return {'name': arvados_node_fqdn(arvados_node),
'ex_userdata': self._make_ping_url(arvados_node)}
@@
-75,6
+75,14
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
self.real.ex_create_tags(cloud_node,
{'Name': arvados_node_fqdn(arvados_node)})
self.real.ex_create_tags(cloud_node,
{'Name': arvados_node_fqdn(arvados_node)})
+ def list_nodes(self):
+ # Need to populate Node.size
+ nodes = super(ComputeNodeDriver, self).list_nodes()
+ for n in nodes:
+ if not n.size:
+ n.size = self.sizes[n.extra["instance_type"]]
+ return nodes
+
@classmethod
def node_fqdn(cls, node):
return node.name
@classmethod
def node_fqdn(cls, node):
return node.name