X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8e31910034627dedd7259dd1e45a60768108c1e1..6fe8e52020d421797306e5c6536afbcee761510a:/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 c6c119b288..56812d258a 100644 --- a/services/nodemanager/arvnodeman/computenode/driver/ec2.py +++ b/services/nodemanager/arvnodeman/computenode/driver/ec2.py @@ -91,7 +91,7 @@ class ComputeNodeDriver(BaseComputeNodeDriver): "VolumeSize": volsize, "VolumeType": "gp2" }}] - if size.preemptable: + if size.preemptible: # Request a Spot instance for this node kw['ex_spot_market'] = True return kw @@ -110,8 +110,8 @@ class ComputeNodeDriver(BaseComputeNodeDriver): nodes = super(ComputeNodeDriver, self).list_nodes() for n in nodes: if not n.size: - n.size = self.sizes[n.extra["instance_type"]] - n.extra['arvados_node_size'] = n.extra.get('metadata', {}).get('arvados_node_size') + n.size = self.sizes()[n.extra["instance_type"]] + n.extra['arvados_node_size'] = n.extra.get('tags', {}).get('arvados_node_size') return nodes @classmethod