projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15720: Batch user update API.
[arvados.git]
/
lib
/
dispatchcloud
/
driver.go
diff --git
a/lib/dispatchcloud/driver.go
b/lib/dispatchcloud/driver.go
index 6162c81b63bc4589df0d4beb3bbe6bc35a4330e8..f1ae68c001b24e7c8c613db9680105b57889edb1 100644
(file)
--- a/
lib/dispatchcloud/driver.go
+++ b/
lib/dispatchcloud/driver.go
@@
-17,13
+17,16
@@
import (
"golang.org/x/crypto/ssh"
)
"golang.org/x/crypto/ssh"
)
-var drivers = map[string]cloud.Driver{
+// Map of available cloud drivers.
+// Clusters.*.Containers.CloudVMs.Driver configuration values
+// correspond to keys in this map.
+var Drivers = map[string]cloud.Driver{
"azure": azure.Driver,
"ec2": ec2.Driver,
}
func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID, logger logrus.FieldLogger, reg *prometheus.Registry) (cloud.InstanceSet, error) {
"azure": azure.Driver,
"ec2": ec2.Driver,
}
func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID, logger logrus.FieldLogger, reg *prometheus.Registry) (cloud.InstanceSet, error) {
- driver, ok :=
d
rivers[cluster.Containers.CloudVMs.Driver]
+ driver, ok :=
D
rivers[cluster.Containers.CloudVMs.Driver]
if !ok {
return nil, fmt.Errorf("unsupported cloud driver %q", cluster.Containers.CloudVMs.Driver)
}
if !ok {
return nil, fmt.Errorf("unsupported cloud driver %q", cluster.Containers.CloudVMs.Driver)
}
@@
-85,7
+88,7
@@
func (is defaultTaggingInstanceSet) Create(it arvados.InstanceType, image cloud.
return is.InstanceSet.Create(it, image, allTags, init, pk)
}
return is.InstanceSet.Create(it, image, allTags, init, pk)
}
-// Filter
s
the instances returned by the wrapped InstanceSet's
+// Filter the instances returned by the wrapped InstanceSet's
// Instances() method (in case the wrapped InstanceSet didn't do this
// itself).
type filteringInstanceSet struct {
// Instances() method (in case the wrapped InstanceSet didn't do this
// itself).
type filteringInstanceSet struct {