From 97b58e7eae01ebe5df5d0bfdff4e6154e7ca869b Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 17 Jun 2017 14:34:02 +0200 Subject: syz-manager/mgrconfig: move sshkey from vm config to manager config Sshkey is a property of image, which is in manager config. Move sshkey to the same location as image. The motivation for the move is as follows. Continuous build produces an image and the key, both need to be passed manager instance. Continuous build system should not distinguish different VM types and mess with their configs. NOTE FOR USERS: this breaks manager configs again. Hopefully the last time for now. Docs are updated. --- vm/gce/gce.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vm/gce') diff --git a/vm/gce/gce.go b/vm/gce/gce.go index d0a181250..eeae077a5 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -34,7 +34,6 @@ type Config struct { Count int // number of VMs to use Machine_Type string // GCE machine type (e.g. "n1-highcpu-2") GCS_Path string // GCS path to upload image - Sshkey string // root ssh key for the image } type Pool struct { @@ -68,7 +67,7 @@ func ctor(env *vmimpl.Env) (vmimpl.Pool, error) { Count: 1, } if err := config.LoadData(env.Config, cfg); err != nil { - return nil, err + return nil, fmt.Errorf("failed to parse gce vm config: %v", err) } if cfg.Count < 1 || cfg.Count > 1000 { return nil, fmt.Errorf("invalid config param count: %v, want [1, 1000]", cfg.Count) @@ -82,7 +81,6 @@ func ctor(env *vmimpl.Env) (vmimpl.Pool, error) { if cfg.GCS_Path == "" { return nil, fmt.Errorf("gcs_path parameter is empty") } - cfg.Sshkey = osutil.Abs(cfg.Sshkey) GCE, err := gce.NewContext() if err != nil { @@ -150,7 +148,7 @@ func (pool *Pool) Create(workdir string, index int) (vmimpl.Instance, error) { pool.GCE.DeleteInstance(name, true) } }() - sshKey := pool.cfg.Sshkey + sshKey := pool.env.Sshkey sshUser := "root" if sshKey == "" { // Assuming image supports GCE ssh fanciness. -- cgit mrf-deployment