bugfix: 手动安装p-agent,windows服务器失败(close TencentBlueKing#233)

CohleRustW · Nov 3, 2021 · dc5df56 · dc5df56
1 parent 666c1b9
commit dc5df56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/apps/backend/agent/tools.py b/apps/backend/agent/tools.py
@@ -106,7 +106,7 @@ def choose_script_file(host: models.Host) -> str:
         # proxy 安装
         return "setup_proxy.sh"
 
-    if host.install_channel_id or (host.node_type == constants.NodeType.PAGENT and not host.is_manual):
+    if host.install_channel_id or host.node_type == constants.NodeType.PAGENT:
         # 远程安装 P-AGENT 或者指定安装通道时，用 setup_pagent 脚本
         return constants.SetupScriptFileName.SETUP_PAGENT_PY.value
 
@@ -187,6 +187,8 @@ def gen_commands(host: models.Host, pipeline_id: str, is_uninstall: bool) -> Ins
 
         dest_dir = jump_server.agent_config["temp_path"]
         dest_dir = suffix_slash("linux", dest_dir)
+        if host.is_manual:
+            run_cmd_params.insert(0, f"{dest_dir}{script_file_name} ")
         host_tmp_path = suffix_slash(host.os_type.lower(), host.agent_config["temp_path"])
         host_identity = (
             host.identity.key if host.identity.auth_type == constants.AuthType.KEY else host.identity.password

diff --git a/dev_log/2.1.354/xcwang_202111031646.yaml b/dev_log/2.1.354/xcwang_202111031646.yaml
@@ -0,0 +1,3 @@
+---
+bugfix:
+  - "手动安装p-agent,windows服务器失败(close #233)"