mirror of https://github.com/jumpserver/jumpserver
perf: 优化winrm协议网域连接支持ssh_key
parent
cbe384161a
commit
187c1e3804
|
@ -1,11 +1,12 @@
|
|||
import json
|
||||
import os
|
||||
import shutil
|
||||
import yaml
|
||||
|
||||
from collections import defaultdict
|
||||
from hashlib import md5
|
||||
from socket import gethostname
|
||||
|
||||
import yaml
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext as _
|
||||
|
@ -239,10 +240,12 @@ class BasePlaybookManager:
|
|||
jms_asset, jms_gateway = host['jms_asset'], host.get('gateway')
|
||||
if not jms_gateway:
|
||||
continue
|
||||
|
||||
server = SSHTunnelForwarder(
|
||||
(jms_gateway['address'], jms_gateway['port']),
|
||||
ssh_username=jms_gateway['username'],
|
||||
ssh_password=jms_gateway['secret'],
|
||||
ssh_pkey=jms_gateway['private_key_path'],
|
||||
remote_bind_address=(jms_asset['address'], jms_asset['port'])
|
||||
)
|
||||
try:
|
||||
|
|
|
@ -100,7 +100,8 @@ class JMSInventory:
|
|||
if ansible_connection in ('local', 'winrm'):
|
||||
host['gateway'] = {
|
||||
'address': gateway.address, 'port': gateway.port,
|
||||
'username': gateway.username, 'secret': gateway.password
|
||||
'username': gateway.username, 'secret': gateway.password,
|
||||
'private_key_path': gateway.private_key_path
|
||||
}
|
||||
host['jms_asset']['port'] = port
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue