From 5304326a05a8fb9a8044b6e47ae065a1959285f1 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Fri, 15 Dec 2023 14:13:41 +0800 Subject: [PATCH] [ Agent ] [ App ] - offline build chrony server --- agent-go/executor/BaseFunction.go | 8 ++++---- .../io/wdd/func/auto/service/BaseFuncScheduler.java | 10 +++++----- .../java/io/wdd/server/func/TestBaseFuncScheduler.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/agent-go/executor/BaseFunction.go b/agent-go/executor/BaseFunction.go index f6b395c..2f59262 100644 --- a/agent-go/executor/BaseFunction.go +++ b/agent-go/executor/BaseFunction.go @@ -1808,10 +1808,10 @@ func (op *AgentOsOperator) installChronyByDockerExec(funcArgs []string) (bool, [ } } - // check image exists - if !BasicDockerImageExists("simonrupf/chronyd", "0.4.3") { + parseIP := net.ParseIP(funcArgs[0]) + if parseIP == nil { return false, []string{ - "[installChronyByDockerExec] - docker image not exists !", + "[installChronyByDockerExec] - ip args error !", } } @@ -1825,7 +1825,7 @@ func (op *AgentOsOperator) installChronyByDockerExec(funcArgs []string) (bool, [ "--publish=123:123/udp", "--env=NTP_SERVERS=\"ntp1.aliyun.com,ntp2.aliyun.com,ntp3.aliyun.com,ntp4.aliyun.com\"", "--env=LOG_LEVEL=0", - "simonrupf/chronyd", + funcArgs[0] + "：8033/cmii/chronyd:0.4.3", }) if !ok { return false, append(resultLog, "[installChronyByDockerExec] - docker chrony run error !") diff --git a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java index bbd22ca..8130033 100644 --- a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java @@ -95,10 +95,10 @@ public class BaseFuncScheduler { List masterNodeProcedureList = List.of( -// BaseFunctionEnum.DISABLE_SWAP, -// BaseFunctionEnum.SHUTDOWN_FIREWALL, -// BaseFunctionEnum.CHRONY_TO_MASTER, -// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY + BaseFunctionEnum.DISABLE_SWAP, + BaseFunctionEnum.SHUTDOWN_FIREWALL, + BaseFunctionEnum.CHRONY_TO_MASTER, + BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY ); @@ -132,7 +132,7 @@ public class BaseFuncScheduler { } List masterNodeDurationTaskList = List.of( -// BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE, + BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE, BaseFunctionEnum.INSTALL_DOCKER, BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, BaseFunctionEnum.MODIFY_DOCKER_CONFIG, diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index 22c092c..99e1e6d 100644 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -53,11 +53,11 @@ public class TestBaseFuncScheduler { projectDeployContext.setMasterNode(serverInfoPO); - baseFuncScheduler.runProcedure(projectDeployContext); +// baseFuncScheduler.runProcedure(projectDeployContext); // harborFuncScheduler.runProcedure(projectDeployContext); -// appFuncScheduler.runProcedure(projectDeployContext); + appFuncScheduler.runProcedure(projectDeployContext); } }