projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7478: Replaces term 'preemptable' with 'preemptible'
[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 c6c119b2885bb265a6e44087f17a4ad9b786a205..2b1564279717d0d0159bd3c07b307b4b5675c98f 100644
(file)
--- 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"
}}]
"VolumeSize": volsize,
"VolumeType": "gp2"
}}]
- if size.preempt
a
ble:
+ if size.preempt
i
ble:
# Request a Spot instance for this node
kw['ex_spot_market'] = True
return kw
# Request a Spot instance for this node
kw['ex_spot_market'] = True
return kw
@@
-111,7
+111,7
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
for n in nodes:
if not n.size:
n.size = self.sizes[n.extra["instance_type"]]
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.extra['arvados_node_size'] = n.extra.get('
tags
', {}).get('arvados_node_size')
return nodes
@classmethod
return nodes
@classmethod