14807: Drain instances that crunch-run reports broken.

[arvados.git] / lib / dispatchcloud / driver.go

diff --git a/lib/dispatchcloud/driver.go b/lib/dispatchcloud/driver.go
index fe5362437299bb00ac04dac2b444cb0551afe202..0343f85b91a7bc63d20034e111e04487608bef9c 100644 (file)
--- a/lib/dispatchcloud/driver.go
+++ b/lib/dispatchcloud/driver.go
@@ -8,17 +8,21 @@ import (
        "fmt"
 
        "git.curoverse.com/arvados.git/lib/cloud"
+       "git.curoverse.com/arvados.git/lib/cloud/azure"
+       "git.curoverse.com/arvados.git/lib/cloud/ec2"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "github.com/sirupsen/logrus"
 )
 
 var drivers = map[string]cloud.Driver{
-       "azure": "",
+       "azure": azure.Driver,
+       "ec2":   ec2.Driver,
 }
 
-func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID) (cloud.InstanceSet, error) {
+func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID, logger logrus.FieldLogger) (cloud.InstanceSet, error) {
        driver, ok := drivers[cluster.CloudVMs.Driver]
        if !ok {
                return nil, fmt.Errorf("unsupported cloud driver %q", cluster.CloudVMs.Driver)
        }
-       return driver.InstanceSet(cluster.CloudVMs.DriverParameters, setID)
+       return driver.InstanceSet(cluster.CloudVMs.DriverParameters, setID, logger)
 }