[ARVADOS] updated: 9b914107504ece419ee2f7d72be7d6262037ff52

[git at public.curoverse.com]

Summary of changes:
 services/nodemanager/arvnodeman/computenode/driver/azure.py | 4 ++++
 services/nodemanager/setup.py                               | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

       via  9b914107504ece419ee2f7d72be7d6262037ff52 (commit)
       via  03980b49e2fb3cac357e417acea64cd342d1065e (commit)
      from  19a2e9a97939126293ce33d72f576f6f54da574f (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 9b914107504ece419ee2f7d72be7d6262037ff52
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 26 15:24:11 2015 -0400

    6507: Filter out "tag_" from create_kwargs.

diff --git a/services/nodemanager/arvnodeman/computenode/driver/azure.py b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index f4686b9..014b92c 100644
--- a/services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/azure.py
@@ -27,6 +27,10 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
         self.tags = {key[4:]: value
                      for key, value in create_kwargs.iteritems()
                      if key.startswith('tag_')}
+        # filter out tags from create_kwargs
+        create_kwargs = {key: value
+                         for key, value in create_kwargs.iteritems()
+                         if not key.startswith('tag_')}
         super(ComputeNodeDriver, self).__init__(
             auth_kwargs, list_kwargs, create_kwargs,
             driver_class)

commit 03980b49e2fb3cac357e417acea64cd342d1065e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 26 15:23:35 2015 -0400

    6507: Use dependency_links to specify custom libcloud package needed for azure support.

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 502690b..d2de38f 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -25,14 +25,17 @@ setup(name='arvados-node-manager',
       license='GNU Affero General Public License, version 3.0',
       packages=find_packages(),
       install_requires=[
-        'apache-libcloud>=0.18',
+        'apache-libcloud>=0.16',
         'arvados-python-client>=0.1.20150206225333',
         'pykka',
         'python-daemon',
         ],
+      dependency_links = [
+          "https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.0+azurearm.zip"
+      ],
       scripts=['bin/arvados-node-manager'],
       test_suite='tests',
-      tests_require=['mock>=1.0'],
+      tests_require=['mock>=1.0', "apache-libcloud==0.18.0+azurearm"],
       zip_safe=False,
       cmdclass={'egg_info': tagger},
       )

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


hooks/post-receive
--