Merge pull request #7988 from wanyaoqi/bugfix/wyq/fix=host-deployer-base-image

bugfix: fix host deployer base image
This commit is contained in:
yunion-ci-robot
2020-09-21 18:33:16 +08:00
committed by GitHub
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.3
FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.4
MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+1
View File
@@ -369,6 +369,7 @@ func (vd *VDDKDisk) ConnectBlockDevice() (string, error) {
}
cmd := NewCommand(execpath(), "-info", "-connect-disk", "-host", vd.Host, "-port", strconv.Itoa(vd.Port), "-user", vd.User,
"-password", vd.Passwd, "-mode", "nbd", "-thumb", thumb, "-vm", fmt.Sprintf("moref=%s", vd.VmRef), vd.DiskPath)
log.Infof("command to mount: %s", cmd)
env := os.Environ()
env = append(env, fmt.Sprintf("LD_LIBRARY_PATH=%s", libdir()))
cmd.Env = env
+1 -1
View File
@@ -98,7 +98,7 @@ func (s *SBaseSystemService) reloadConf(conf, conFile string) (bool, error) {
output, _ := procutils.NewRemoteCommandAsFarAsPossible("cat", conFile).Output()
oldConf := string(output)
if conf != oldConf {
log.Infof("Reload service %s ...", s.name)
log.Debugf("Reload service %s ...", s.name)
err := procutils.NewRemoteCommandAsFarAsPossible("rm", "-f", conFile).Run()
if err != nil {
return false, err