From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 20 Sep 2019 15:16:04 +0000 (-0400)
Subject: 15649: Pin libcloud 2.5.0.
X-Git-Tag: 2.0.0~197^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d04751846aa221610a463bce1efaf624c36eaffc?ds=inline;hp=3aed87eca24ce57ca154e76155204d107970bbed

15649: Pin libcloud 2.5.0.

libcloud 2.6.0 uses an incorrect blob storage URL when creating Azure
nodes.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index fcfd36339a..a2b9a0ca92 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -40,7 +40,7 @@ setup(name='arvados-node-manager',
           ('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst', 'arvados-node-manager.service']),
       ],
       install_requires=[
-          'apache-libcloud>=2.3.1.dev1',
+          'apache-libcloud==2.5.0', # 2.6.0 cannot create azure nodes, #15649
           'arvados-python-client{}'.format(pysdk_dep),
           'future',
           'pykka < 2',
@@ -48,15 +48,12 @@ setup(name='arvados-node-manager',
           'setuptools',
           'subprocess32>=3.5.1',
       ],
-      dependency_links=[
-          "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.3.1.dev1.zip"
-      ],
       test_suite='tests',
       tests_require=[
           'requests',
           'pbr<1.7.0',
           'mock>=1.0',
-          'apache-libcloud>=2.3.1.dev1',
+          'apache-libcloud==2.5.0',
           'subprocess32>=3.5.1',
       ],
       zip_safe=False