projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16118: Set URL path to '/' to all services instead of just keep-web.
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
computenode
/
driver
/
azure.py
diff --git
a/services/nodemanager/arvnodeman/computenode/driver/azure.py
b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index 152817253589cfbe7e4f8f1870437f4e8c97c382..35c8b5a8c97db40b4d15a7ad20e20acaefdc605a 100644
(file)
--- a/
services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/
services/nodemanager/arvnodeman/computenode/driver/azure.py
@@
-46,6
+46,8
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
def arvados_create_kwargs(self, size, arvados_node):
tags = {
def arvados_create_kwargs(self, size, arvados_node):
tags = {
+ # Set up tag indicating the Arvados assigned Cloud Size id.
+ 'arvados_node_size': size.id,
'booted_at': time.strftime(ARVADOS_TIMEFMT, time.gmtime()),
'arv-ping-url': self._make_ping_url(arvados_node)
}
'booted_at': time.strftime(ARVADOS_TIMEFMT, time.gmtime()),
'arv-ping-url': self._make_ping_url(arvados_node)
}
@@
-87,7
+89,8
@@
echo %s > /var/tmp/arv-node-data/meta-data/instance-type
for n in nodes:
# Need to populate Node.size
if not n.size:
for n in nodes:
# Need to populate Node.size
if not n.size:
- n.size = self.sizes[n.extra["properties"]["hardwareProfile"]["vmSize"]]
+ n.size = self.sizes()[n.extra["properties"]["hardwareProfile"]["vmSize"]]
+ n.extra['arvados_node_size'] = n.extra.get('tags', {}).get('arvados_node_size') or n.size.id
return nodes
def broken(self, cloud_node):
return nodes
def broken(self, cloud_node):