From dc4b791f7e48c53f63685875cf2ce671605e9dfd Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 10 Jul 2019 19:01:22 +0800 Subject: [PATCH] add build file --- build/host-deployer/vars | 1 + pkg/hostman/guestman/qemu-kvm.go | 4 ++-- pkg/hostman/hostdeployer/deployserver/deployserver.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 build/host-deployer/vars diff --git a/build/host-deployer/vars b/build/host-deployer/vars new file mode 100644 index 0000000000..7190279c35 --- /dev/null +++ b/build/host-deployer/vars @@ -0,0 +1 @@ +DESCRIPTION="Yunion Host Deploy Agent" \ No newline at end of file diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index fb526151a4..d923348b38 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -1354,9 +1354,9 @@ func (s *SKVMGuestInstance) StaticSaveSnapshot( if err != nil { return nil, err } - location := path.Join(disk.GetSnapshotDir(), snapshotId) + location := path.Join(disk.GetSnapshotLocation(), snapshotId) res := jsonutils.NewDict() - res.Set("localtion", jsonutils.NewString(location)) + res.Set("location", jsonutils.NewString(location)) return res, nil } diff --git a/pkg/hostman/hostdeployer/deployserver/deployserver.go b/pkg/hostman/hostdeployer/deployserver/deployserver.go index f944abc638..66f5383613 100644 --- a/pkg/hostman/hostdeployer/deployserver/deployserver.go +++ b/pkg/hostman/hostdeployer/deployserver/deployserver.go @@ -226,7 +226,7 @@ func (s *SDeployService) PrepareEnv() error { } if !winutils.CheckTool(DeployOption.ChntpwPath) { - return fmt.Errorf("Failed to find chntpw tool") + log.Errorf("Failed to find chntpw tool") } output, err = procutils.NewCommand("pvscan").Run()