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. --- tools/syz-crush/crush.go | 8 +------- tools/syz-repro/repro.go | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index 6020ab4a2..f5768d0d6 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -36,13 +36,7 @@ func main() { if len(flag.Args()) != 1 { Fatalf("usage: syz-crush -config=config.file execution.log") } - env := &vm.Env{ - Name: cfg.Name, - Workdir: cfg.Workdir, - Image: cfg.Image, - Debug: false, - Config: cfg.VM, - } + env := mgrconfig.CreateVMEnv(cfg, false) vmPool, err := vm.Create(cfg.Type, env) if err != nil { Fatalf("%v", err) diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go index 99c826207..d144b88de 100644 --- a/tools/syz-repro/repro.go +++ b/tools/syz-repro/repro.go @@ -37,13 +37,7 @@ func main() { if err != nil { Fatalf("failed to open log file: %v", err) } - env := &vm.Env{ - Name: cfg.Name, - Workdir: cfg.Workdir, - Image: cfg.Image, - Debug: false, - Config: cfg.VM, - } + env := mgrconfig.CreateVMEnv(cfg, false) vmPool, err := vm.Create(cfg.Type, env) if err != nil { Fatalf("%v", err) -- cgit mrf-deployment