github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-24 05:57:31 +00:00
Code Issues Projects Releases Wiki Activity

fix: automation no account

Browse Source
This commit is contained in:
feng 2025-04-17 13:59:00 +08:00 committed by ZhaoJiSen
parent 3d6d2af268
commit 67422ef4ba
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,6 +190,12 @@ class JMSInventory:
return ansible_config return ansible_config
def asset_to_host(self, asset, account, automation, protocols, platform, path_dir): def asset_to_host(self, asset, account, automation, protocols, platform, path_dir):
name = re.sub(r'[ \[\]/]', '_', asset.name)
host = {'name': name}
if account is None:
host['error'] = _('No account available')
return host
try: try:
ansible_config = dict(automation.ansible_config) ansible_config = dict(automation.ansible_config)
except (AttributeError, TypeError): except (AttributeError, TypeError):
@ -198,11 +204,10 @@ class JMSInventory:
protocol = self.get_primary_protocol(ansible_config, protocols) protocol = self.get_primary_protocol(ansible_config, protocols)
tp, category = asset.type, asset.category tp, category = asset.type, asset.category
name = re.sub(r'[ \[\]/]', '_', asset.name)
secret_info = {k: v for k, v in asset.secret_info.items() if v} secret_info = {k: v for k, v in asset.secret_info.items() if v}
username = self.get_username(asset, account) username = self.get_username(asset, account)
host = { host.update({
'name': name,
'local_python_interpreter': sys.executable, 'local_python_interpreter': sys.executable,
'jms_asset': { 'jms_asset': {
'id': str(asset.id), 'name': asset.name, 'address': asset.address, 'id': str(asset.id), 'name': asset.name, 'address': asset.address,
@ -218,7 +223,7 @@ class JMSInventory:
'secret': account.escape_jinja2_syntax(account.secret), 'secret': account.escape_jinja2_syntax(account.secret),
'secret_type': account.secret_type, 'private_key_path': account.get_private_key_path(path_dir) 'secret_type': account.secret_type, 'private_key_path': account.get_private_key_path(path_dir)
} if account else None } if account else None
} })
self.make_protocol_setting_vars(host, protocols) self.make_protocol_setting_vars(host, protocols)