[ARVADOS] updated: 72124442f128b2411b36c318d40d48cca9d39f4b

[git at public.curoverse.com]

Summary of changes:
 .../nodemanager/arvnodeman/computenode/driver/azure.py    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

       via  72124442f128b2411b36c318d40d48cca9d39f4b (commit)
      from  d5f5f869d46f9096c7c680d608c1cc654d1d7fa0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 72124442f128b2411b36c318d40d48cca9d39f4b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 1 22:29:38 2015 -0400

    7286: Use ex_customdata to put the ping URL on the node instead of
    ex_run_command.

diff --git a/services/nodemanager/arvnodeman/computenode/driver/azure.py b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index ca6ed7c..2d18978 100644
--- a/services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/azure.py
@@ -48,6 +48,7 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
         return {
             'name': name,
             'ex_tags': tags,
+            'ex_customdata': tags['arv-ping-url']
         }
 
     def sync_node(self, cloud_node, arvados_node):
@@ -61,20 +62,6 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
     def _init_image(self, urn):
         return "image", self.get_image(urn)
 
-    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
-                                 echo "%s" > /var/tmp/arv-node-data/arv-ping-url
-                                 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
-                                 '""" % (cloud_node.extra["tags"]["arv-ping-url"],
-                                         cloud_node.id,
-                                         cloud_node.extra["properties"]["hardwareProfile"]["vmSize"],
-                                         cloud_node.private_ips[0]),
-                                 timestamp=int(time.time()))
-
     def list_nodes(self):
         # Azure only supports filtering node lists by resource group.
         # Do our own filtering based on tag.

-----------------------------------------------------------------------


hooks/post-receive
--