From 9fdfd5c5b229ea42193710f891e953b452bd90e7 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 11 Oct 2017 13:03:20 -0400 Subject: [PATCH] 12431: Use libcloud fork 2.2.2.dev1 Should address issue deleting NICs. Also add ex_fetch_power_state=False to reduce Azure API calls. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- build/libcloud-pin.sh | 2 +- services/nodemanager/arvnodeman/computenode/driver/azure.py | 2 +- services/nodemanager/setup.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/libcloud-pin.sh b/build/libcloud-pin.sh index f9a3feda8a..e78838d654 100644 --- a/build/libcloud-pin.sh +++ b/build/libcloud-pin.sh @@ -2,4 +2,4 @@ # # SPDX-License-Identifier: AGPL-3.0 -LIBCLOUD_PIN=2.2.1.dev2 +LIBCLOUD_PIN=2.2.2.dev1 diff --git a/services/nodemanager/arvnodeman/computenode/driver/azure.py b/services/nodemanager/arvnodeman/computenode/driver/azure.py index aad608d417..e0f260ab86 100644 --- a/services/nodemanager/arvnodeman/computenode/driver/azure.py +++ b/services/nodemanager/arvnodeman/computenode/driver/azure.py @@ -82,7 +82,7 @@ echo %s > /var/tmp/arv-node-data/meta-data/instance-type # Azure only supports filtering node lists by resource group. # Do our own filtering based on tag. nodes = [node for node in - super(ComputeNodeDriver, self).list_nodes(ex_fetch_nic=False) + super(ComputeNodeDriver, self).list_nodes(ex_fetch_nic=False, ex_fetch_power_state=False) if node.extra["tags"].get("arvados-class") == self.tags["arvados-class"]] for n in nodes: # Need to populate Node.size diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py index 0099a6b176..cb69817519 100644 --- a/services/nodemanager/setup.py +++ b/services/nodemanager/setup.py @@ -40,14 +40,14 @@ setup(name='arvados-node-manager', 'setuptools' ], dependency_links=[ - "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.2.1.dev2.zip" + "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.2.2.dev1.zip" ], test_suite='tests', tests_require=[ 'requests', 'pbr<1.7.0', 'mock>=1.0', - 'apache-libcloud==2.2.1.dev2', + 'apache-libcloud==2.2.2.dev1', ], zip_safe=False, cmdclass={'egg_info': tagger}, -- 2.30.2