github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-09 03:09:34 +00:00
Code Issues Projects Releases Wiki Activity

feat: ansible receptor 适配文件上传

Browse Source
This commit is contained in:
Aaron3S
2024-04-11 18:19:07 +08:00
committed by Bryan
parent 3f67b40975
commit 6a12bc39e9
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/ops/models/job.py
View File

@@ -58,7 +58,7 @@ class JMSPermedInventory(JMSInventory):
self.module = module
self.assets_accounts_mapper = self.get_assets_accounts_mapper()
def make_account_vars(self, host, asset, account, automation, protocol, platform, gateway):
def make_account_vars(self, host, asset, account, automation, protocol, platform, gateway, path_dir):
if not account:
host['error'] = _("No account available")
return host
@@ -90,7 +90,7 @@ class JMSPermedInventory(JMSInventory):
}
host['jms_asset']['port'] = protocol.port
return host
return super().make_account_vars(host, asset, account, automation, protocol, platform, gateway)
return super().make_account_vars(host, asset, account, automation, protocol, platform, gateway, path_dir)
def get_asset_sorted_accounts(self, asset):
accounts = self.assets_accounts_mapper.get(asset.id, [])
@@ -347,7 +347,7 @@ class JobExecution(JMSOrgBaseModel):
job_id = self.current_job.id
args = json.loads(self.current_job.args)
dst_path = args.get('dst_path', '/')
runner = UploadFileRunner(self.inventory_path, job_id, dst_path)
runner = UploadFileRunner(self.inventory_path, self.private_dir, job_id, dst_path)
else:
raise Exception("unsupported job type")
return runner