后端：修复hosts inventory错误

rpyc_scheduler/scheduler-server.py

@@ -47,7 +47,8 @@ def exposed_add_job(self, func, **kwargs):
                                   end_date=trigger_args['end_date'])
             return scheduler.add_job(func, CronTrigger.from_crontab(trigger), **kwargs)
         elif trigger == 'date':
-            return scheduler.add_job(func, DateTrigger(run_date=trigger_args['run_date']), **kwargs)
+            return scheduler.add_job(func, DateTrigger(
+                run_date=trigger_args['run_date'] if trigger_args is not None else None), **kwargs)
 
     def exposed_modify_job(self, job_id, jobstore=None, **changes):
         logger.debug(changes)

rpyc_scheduler/tasks.py

@@ -1,13 +1,16 @@
+import os.path
 import subprocess
 import json
 import ansible_runner
+from pathlib import Path
+from pydantic import parse_obj_as
 from typing import List, Dict, Any, Union
 from datetime import datetime
 from loguru import logger
 from sqlmodel import text
 from utils import Channel, hosts_to_inventory
 from config import rpc_config
-from models import engine
+from models import engine, InventoryHost
 
 
 def local_executor(job_id, host, command):
@@ -25,13 +28,27 @@ def local_executor(job_id, host, command):
     return status, (end_time - start_time).total_seconds(), channel.msg
 
 
-def ansible_task(**kwargs):
-    hosts = kwargs.pop('targets')
-    ansible_args = kwargs.pop('ansible')
-    logger.debug(f'task hosts:{hosts}')
-    logger.debug(f'ansible args:{ansible_args}')
-    # ansible_inventory = hosts_to_inventory(hosts)
-    # runner = ansible_runner.run(**kwargs)
+def ansible_task(job_id, targets, ansible_args):
+    private_data_dir = Path(f'/tmp/ansible/{job_id}')
+    if not private_data_dir.exists():
+        private_data_dir.mkdir(parents=True)
+    logger.debug(f'job id:{job_id},task hosts:{targets},ansible_args:{ansible_args}')
+    hosts: List[InventoryHost] = []
+    with engine.connect() as conn:
+        sql = text(
+            "select id,name,ansible_host,ansible_port,ansible_user,ansible_password,ansible_ssh_private_key from host where id in :targets").bindparams(
+            targets=targets)
+        result = conn.execute(sql).fetchall()
+        logger.debug(result)
+        for row in result:
+            hosts.append(
+                InventoryHost(id=row[0], name=row[1], ansible_host=row[2], ansible_port=row[3], ansible_user=row[4],
+                              ansible_password=row[5], ansible_ssh_private_key=row[6]))
+    ansible_inventory = hosts_to_inventory(hosts, private_data_dir)
+    logger.debug(ansible_inventory)
+    runner = ansible_runner.run(private_data_dir=str(private_data_dir), inventory=ansible_inventory,
+                                host_pattern='all',
+                                **ansible_args)
 
 
 def run_command_with_channel(job_id=None, targets: List[str] = None, command=None):

rpyc_scheduler/utils.py

@@ -1,5 +1,7 @@
 import redis
+import os
 from loguru import logger
+from pathlib import Path
 from typing import Dict, Any, List
 from models import InventoryHost
 
@@ -40,13 +42,14 @@ def close(self, ):
         self.conn.close()
 
 
-def hosts_to_inventory(hosts: List[InventoryHost], private_data_dir):
+def hosts_to_inventory(hosts: List[InventoryHost], private_data_dir: Path):
     """
     转换hosts为inventory格式的数据
     :params hosts:
     :params private_data_dir:ansible-runner的环境目录，其中保存runner执行过程的所有数据
     """
     inventory = {}
+    logger.debug(hosts)
     for host in hosts:
         inventory[host.name] = {
             "ansible_host": host.ansible_host,
@@ -57,4 +60,8 @@ def hosts_to_inventory(hosts: List[InventoryHost], private_data_dir):
             inventory[host.name]["ansible_password"] = host.ansible_password
         if host.ansible_ssh_private_key:
             # 私钥保存到本地文件，并指向对应路径
-            inventory[host.name]["ansible_ssh_private_key_file"] = host.ansible_ssh_private_key
+            private_key_file = private_data_dir / f"{host.ansible_host}"
+            private_key_file.write_text(host.ansible_ssh_private_key)
+            os.chmod(str(private_key_file), 0o600)
+            inventory[host.name]["ansible_ssh_private_key_file"] = str(private_key_file)
+    return {'all': {'hosts': inventory}}