[ARVADOS] updated: bd4c54298a89dd24b6a457bf4ffd869f5af37c52

git at public.curoverse.com git at public.curoverse.com
Tue Sep 1 09:13:59 EDT 2015


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

       via  bd4c54298a89dd24b6a457bf4ffd869f5af37c52 (commit)
      from  1352b00b037db2ce5de291127b4f1e845bc6b73b (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 bd4c54298a89dd24b6a457bf4ffd869f5af37c52
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 1 09:15:28 2015 -0400

    Fix import error for NodeAuthSSHKey refs #6507

diff --git a/services/nodemanager/arvnodeman/computenode/driver/__init__.py b/services/nodemanager/arvnodeman/computenode/driver/__init__.py
index e3298a7..724c772 100644
--- a/services/nodemanager/arvnodeman/computenode/driver/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/__init__.py
@@ -5,7 +5,7 @@ from __future__ import absolute_import, print_function
 from operator import attrgetter
 
 import libcloud.common.types as cloud_types
-from libcloud.compute.base import NodeDriver
+from libcloud.compute.base import NodeDriver, NodeAuthSSHKey
 
 from ...config import NETWORK_ERRORS
 
@@ -58,7 +58,7 @@ class BaseComputeNodeDriver(object):
 
     def _init_ssh_key(self, filename):
         with open(filename) as ssh_file:
-            key = cloud_base.NodeAuthSSHKey(ssh_file.read())
+            key = NodeAuthSSHKey(ssh_file.read())
         return 'auth', key
 
     def search_for(self, term, list_method, key=attrgetter('id'), **kwargs):

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list