X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d75d084f12dbc5efdcf9a65da7849aa5cc183ea5..7db74f672f64b3e647a98c1d8e5978b50d79538d:/lib/cloud/cloudtest/cmd.go

diff --git a/lib/cloud/cloudtest/cmd.go b/lib/cloud/cloudtest/cmd.go
index b3a262c7e4..2dc13e5a51 100644
--- a/lib/cloud/cloudtest/cmd.go
+++ b/lib/cloud/cloudtest/cmd.go
@@ -18,7 +18,6 @@ import (
 	"git.arvados.org/arvados.git/lib/dispatchcloud"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
-	"golang.org/x/crypto/ssh"
 )
 
 var Command command
@@ -65,9 +64,9 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 	if err != nil {
 		return 1
 	}
-	key, err := ssh.ParsePrivateKey([]byte(cluster.Containers.DispatchPrivateKey))
+	key, err := config.LoadSSHKey(cluster.Containers.DispatchPrivateKey)
 	if err != nil {
-		err = fmt.Errorf("error parsing configured Containers.DispatchPrivateKey: %s", err)
+		err = fmt.Errorf("error loading Containers.DispatchPrivateKey: %s", err)
 		return 1
 	}
 	driver, ok := dispatchcloud.Drivers[cluster.Containers.CloudVMs.Driver]
@@ -100,6 +99,7 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 		InstanceType:        it,
 		SSHKey:              key,
 		SSHPort:             cluster.Containers.CloudVMs.SSHPort,
+		DeployPublicKey:     cluster.Containers.CloudVMs.DeployPublicKey,
 		BootProbeCommand:    cluster.Containers.CloudVMs.BootProbeCommand,
 		InstanceInitCommand: cloud.InitCommand(cluster.Containers.CloudVMs.InstanceInitCommand),
 		ShellCommand:        *shellCommand,