projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13111: Merge branch 'master' into 12308-go-fuse
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
computenode
/
driver
/
azure.py
diff --git
a/services/nodemanager/arvnodeman/computenode/driver/azure.py
b/services/nodemanager/arvnodeman/computenode/driver/azure.py
index e293d1bebeb5a479b69ff3e22784b9a467b17dd2..e0f260ab86542252102e28459381505833998d10 100644
(file)
--- a/
services/nodemanager/arvnodeman/computenode/driver/azure.py
+++ b/
services/nodemanager/arvnodeman/computenode/driver/azure.py
@@
-1,4
+1,7
@@
#!/usr/bin/env python
#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
from __future__ import absolute_import, print_function
from __future__ import absolute_import, print_function
@@
-17,7
+20,6
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
DEFAULT_DRIVER = cloud_provider.get_driver(cloud_types.Provider.AZURE_ARM)
SEARCH_CACHE = {}
DEFAULT_DRIVER = cloud_provider.get_driver(cloud_types.Provider.AZURE_ARM)
SEARCH_CACHE = {}
- CLOUD_ERRORS = BaseComputeNodeDriver.CLOUD_ERRORS + (BaseHTTPError,)
def __init__(self, auth_kwargs, list_kwargs, create_kwargs,
driver_class=DEFAULT_DRIVER):
def __init__(self, auth_kwargs, list_kwargs, create_kwargs,
driver_class=DEFAULT_DRIVER):
@@
-80,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
# 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
if node.extra["tags"].get("arvados-class") == self.tags["arvados-class"]]
for n in nodes:
# Need to populate Node.size