projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3408-production-datamanager
[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 9db3d89cb67825c677a208a3d5ebfa9961c7b384..588ca515a9cf3f55abe0b4091928a4c153e41541 100644
(file)
--- a/
services/nodemanager/arvnodeman/computenode/driver/ec2.py
+++ b/
services/nodemanager/arvnodeman/computenode/driver/ec2.py
@@
-80,6
+80,10
@@
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)})
+ @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'
@classmethod
def node_start_time(cls, node):
time_str = node.extra['launch_time'].split('.', 2)[0] + 'UTC'