github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

merge: with remote

Browse Source
This commit is contained in:
ibuler
2022-10-28 19:12:37 +08:00
parent f5fd674f08 121ba1df07
commit 16e3604fcb
43 changed files with 334 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ops/ansible/callback.py
View File

@@ -49,7 +49,7 @@ class DefaultCallback:
}
self.result['ok'][host][task] = detail
def runer_on_failed(self, event_data, host=None, task=None, res=None, **kwargs):
def runner_on_failed(self, event_data, host=None, task=None, res=None, **kwargs):
detail = {
'action': event_data.get('task_action', ''),
'res': res,

2
apps/ops/ansible/inventory.py
View File

@@ -163,9 +163,9 @@ class JMSInventory:
platform_assets = self.group_by_platform(self.assets)
for platform, assets in platform_assets.items():
automation = platform.automation
protocols = platform.protocols.all()
for asset in assets:
protocols = asset.protocols.all()
account = self.select_account(asset)
host = self.asset_to_host(asset, account, automation, protocols, platform)