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

fix: ansible 密码支持 {{ }} {% %} (#12354)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot
2023-12-18 17:31:35 +08:00
committed by GitHub
parent 006faac326
commit 1f2db65dba
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,8 +71,9 @@ class JMSInventory:
}
if not account.secret:
return var
if account.secret_type == 'password':
var['ansible_password'] = account.secret
var['ansible_password'] = account.escape_jinja2_syntax(account.secret)
elif account.secret_type == 'ssh_key':
var['ansible_ssh_private_key_file'] = account.private_key_path
return var
@@ -84,7 +85,7 @@ class JMSInventory:
'custom_become': True,
'custom_become_method': su_method,
'custom_become_user': account.su_from.username,
'custom_become_password': account.su_from.secret,
'custom_become_password': account.escape_jinja2_syntax(account.su_from.secret),
'custom_become_private_key_path': account.su_from.private_key_path
}
return var
@@ -109,7 +110,7 @@ class JMSInventory:
host.update(self.make_account_ansible_vars(account))
host['ansible_become'] = True
host['ansible_become_user'] = 'root'
host['ansible_become_password'] = account.secret
host['ansible_become_password'] = account.escape_jinja2_syntax(account.secret)
else:
host.update(self.make_account_ansible_vars(account))
@@ -173,8 +174,8 @@ class JMSInventory:
},
'jms_account': {
'id': str(account.id), 'username': account.username,
'secret': account.secret, 'secret_type': account.secret_type,
'private_key_path': account.private_key_path
'secret': account.escape_jinja2_syntax(account.secret),
'secret_type': account.secret_type, 'private_key_path': account.private_key_path
} if account else None
}