projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7193: Use tags instead of _make_ping_url
[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 633cb2e9c9588228a9dbdf0d2f3078a952f7b319..4ef4e10bc90486710d6258012d44dedc715e7613 100644
(file)
--- a/
services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/
services/nodemanager/arvnodeman/computenode/driver/azure.py
@@
-55,8
+55,7
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
def _init_image(self, urn):
return "image", self.get_image(urn)
def _init_image(self, urn):
return "image", self.get_image(urn)
- def create_node(self, size, arvados_node):
- cloud_node = super(ComputeNodeDriver, self).create_node(size, arvados_node)
+ def post_create_node(self, cloud_node):
self.real.ex_run_command(cloud_node,
"""bash -c '
mkdir -p /var/tmp/arv-node-data/meta-data
self.real.ex_run_command(cloud_node,
"""bash -c '
mkdir -p /var/tmp/arv-node-data/meta-data
@@
-64,12
+63,11
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
echo "%s" > /var/tmp/arv-node-data/meta-data/instance-id
echo "%s" > /var/tmp/arv-node-data/meta-data/instance-type
echo "%s" > /var/tmp/arv-node-data/meta-data/local-ipv4
echo "%s" > /var/tmp/arv-node-data/meta-data/instance-id
echo "%s" > /var/tmp/arv-node-data/meta-data/instance-type
echo "%s" > /var/tmp/arv-node-data/meta-data/local-ipv4
- '""" % (
self._make_ping_url(arvados_node)
,
+ '""" % (
cloud_node.extra["tags"]["arv-ping-url"]
,
cloud_node.id,
cloud_node.extra["properties"]["hardwareProfile"]["vmSize"],
cloud_node.private_ips[0]),
cloud_node.id,
cloud_node.extra["properties"]["hardwareProfile"]["vmSize"],
cloud_node.private_ips[0]),
- timestamp=time.time())
- return cloud_node
+ timestamp=int(time.time()))
def list_nodes(self):
# Azure only supports filtering node lists by resource group.
def list_nodes(self):
# Azure only supports filtering node lists by resource group.