[ARVADOS] updated: 1ea2c826b7839340f377ed5d41dce3af01c67023

[git at public.curoverse.com]

Summary of changes:
 services/nodemanager/arvnodeman/computenode/driver/azure.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

       via  1ea2c826b7839340f377ed5d41dce3af01c67023 (commit)
      from  eebcb59b9aeeae8a1936fba15270e1f1f7b8487e (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 1ea2c826b7839340f377ed5d41dce3af01c67023
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 4 10:45:34 2015 -0400

    7193: Move ex_run_command to post_create_node()

diff --git a/services/nodemanager/arvnodeman/computenode/driver/azure.py b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index 633cb2e..a8a4fa5 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
@@ -68,8 +67,7 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
                                          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.

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


hooks/post-receive
--