X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a52ab8066f7db20fc5b74fdb8789453cf32ba872..907343b7176738987b26b542664578ee0d8b23f1:/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 633cb2e9c9..4ef4e10bc9 100644 --- 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 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 @@ -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 - '""" % (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]), - timestamp=time.time()) - return cloud_node + timestamp=int(time.time())) def list_nodes(self): # Azure only supports filtering node lists by resource group.