zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ Base ] - refresh for euler

Browse Source
This commit is contained in:
zeaslity
2024-01-24 17:09:48 +08:00
parent 2c1cde980c
commit 4ffd48500c
10 changed files with 111 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main/java/io/wdd/ServerApplication.java
View File

@@ -8,7 +8,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@MapperScan("io.wdd.server.mapper")
public class ServerApplication {
public static void main(String[] args) {
SpringApplication.run(
ServerApplication.class,

6
server/src/main/java/io/wdd/func/auto/beans/BaseFunctionEnum.java
View File

@@ -49,7 +49,6 @@ public enum BaseFunctionEnum {
),
INSTALL_NFS_ONLINE(
"installNfsOnline",
"安装nfs-client online"
@@ -65,6 +64,11 @@ public enum BaseFunctionEnum {
"安装Chrony服务器, 废弃"
),
INSTALL_CHRONY_DOCKER(
"INSTALL_CHRONY_DOCKER",
"安装Chrony服务器, DOCKER版本"
),
CHRONY_TO_PUBLIC_NTP_DISCARD(
"chronyToPublicNTP",
"时间同步至公网NTP服务器"

12
server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
View File

@@ -96,8 +96,8 @@ public class BaseFuncScheduler {
List<BaseFunctionEnum> masterNodeProcedureList = List.of(
BaseFunctionEnum.DISABLE_SWAP,
BaseFunctionEnum.DISABLE_SELINUX,
BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.CHRONY_TO_MASTER,
BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY
);
@@ -132,11 +132,11 @@ public class BaseFuncScheduler {
}
List<BaseFunctionEnum> masterNodeDurationTaskList = List.of(
BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE,
BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
BaseFunctionEnum.INSTALL_HARBOR
// BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE,
// BaseFunctionEnum.INSTALL_DOCKER,
// BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
// BaseFunctionEnum.MODIFY_DOCKER_CONFIG,
// BaseFunctionEnum.INSTALL_HARBOR
);
for (BaseFunctionEnum durationBaseFunc : masterNodeDurationTaskList) {

6
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -53,11 +53,11 @@ public class TestBaseFuncScheduler {
projectDeployContext.setMasterNode(serverInfoPO);
// baseFuncScheduler.runProcedure(projectDeployContext);
baseFuncScheduler.runProcedure(projectDeployContext);
harborFuncScheduler.runProcedure(projectDeployContext);
// harborFuncScheduler.runProcedure(projectDeployContext);
appFuncScheduler.runProcedure(projectDeployContext);
// appFuncScheduler.runProcedure(projectDeployContext);
}
}