diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-06-17 14:34:02 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-06-17 15:02:58 +0200 |
| commit | 97b58e7eae01ebe5df5d0bfdff4e6154e7ca869b (patch) | |
| tree | 83eb9d534ef9193e0ad8bf7aeb778c85b0ea602e /syz-gce | |
| parent | 260cdaa2b2dcdca9cc9d84c1bc08d00d451c68cd (diff) | |
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.
Diffstat (limited to 'syz-gce')
| -rw-r--r-- | syz-gce/syz-gce.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/syz-gce/syz-gce.go b/syz-gce/syz-gce.go index f6a9fae1b..df0395af3 100644 --- a/syz-gce/syz-gce.go +++ b/syz-gce/syz-gce.go @@ -480,14 +480,15 @@ func writeManagerConfig(cfg *Config, httpPort int, file string) error { Syzkaller: "gopath/src/github.com/google/syzkaller", Type: "gce", Image: "image/disk.tar.gz", + Sshkey: sshKey, Sandbox: cfg.Sandbox, Procs: cfg.Procs, Enable_Syscalls: cfg.Enable_Syscalls, Disable_Syscalls: cfg.Disable_Syscalls, Cover: true, Reproduce: true, - VM: []byte(fmt.Sprintf(`{"count": %v, "machine_type": %q, "gcs_path": %q, "sshkey": %q}`, - cfg.Machine_Count, cfg.Machine_Type, cfg.GCS_Path, sshKey)), + VM: []byte(fmt.Sprintf(`{"count": %v, "machine_type": %q, "gcs_path": %q}`, + cfg.Machine_Count, cfg.Machine_Type, cfg.GCS_Path)), } data, err := json.MarshalIndent(managerCfg, "", "\t") if err != nil { |