From feac66a4f25cff3a0df242fd9ef553d19d71b807 Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Fri, 5 Nov 2021 15:40:40 +0800
Subject: [PATCH 06/12] fix eggo deploy bugs

Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
---
 pkg/clusterdeployment/binary/commontools/systemdservices.go | 3 ++-
 pkg/clusterdeployment/runtime/runtime.go                    | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/clusterdeployment/binary/commontools/systemdservices.go b/pkg/clusterdeployment/binary/commontools/systemdservices.go
index e500aab..0a17ee2 100644
--- a/pkg/clusterdeployment/binary/commontools/systemdservices.go
+++ b/pkg/clusterdeployment/binary/commontools/systemdservices.go
@@ -406,10 +406,11 @@ func GetSystemdServiceShell(name string, base64Data string, needRestart bool) (s
 	shell := `
 #!/bin/bash
 {{- if .content }}
-systemctl disable {{ .name }}
 rm -f /usr/lib/systemd/system/{{ .name }}.service
 echo {{ .content }} | base64 -d > /usr/lib/systemd/system/{{ .name }}.service
 systemctl daemon-reload
+# disable success when service file exist
+systemctl disable {{ .name }}
 {{- end }}
 which chcon
 if [ $? -eq 0 ]; then
diff --git a/pkg/clusterdeployment/runtime/runtime.go b/pkg/clusterdeployment/runtime/runtime.go
index ca5e265..edfc4a7 100644
--- a/pkg/clusterdeployment/runtime/runtime.go
+++ b/pkg/clusterdeployment/runtime/runtime.go
@@ -425,6 +425,11 @@ func (ct *DeployRuntimeTask) Run(r runner.Runner, hcg *api.HostConfig) error {
 		return err
 	}
 
+	if _, err := r.RunCommand("sudo -E /bin/sh -c \"rm -rf /etc/docker/daemon.json\""); err != nil {
+		logrus.Errorf("rm docker daemon.json failed: %v", err)
+		return err
+	}
+
 	if err := ct.runtime.PrepareRuntimeService(r, ct.workerConfig); err != nil {
 		logrus.Errorf("prepare container engine service failed: %v", err)
 		return err
-- 
2.25.1

