diff --git a/apps/assets/tasks/asset_user_connectivity.py b/apps/assets/tasks/asset_user_connectivity.py index 6d979d6b1..ab1c417cc 100644 --- a/apps/assets/tasks/asset_user_connectivity.py +++ b/apps/assets/tasks/asset_user_connectivity.py @@ -85,7 +85,7 @@ def test_asset_user_connectivity_util(asset_user, task_name): raw, summary = test_user_connectivity( task_name=task_name, asset=asset_user.asset, username=asset_user.username, password=asset_user.password, - private_key=asset_user.private_key + private_key=asset_user.private_key_file ) except Exception as e: logger.warn("Failed run adhoc {}, {}".format(task_name, e)) diff --git a/apps/assets/tasks/system_user_connectivity.py b/apps/assets/tasks/system_user_connectivity.py index 96ba2ec4d..42b6f2331 100644 --- a/apps/assets/tasks/system_user_connectivity.py +++ b/apps/assets/tasks/system_user_connectivity.py @@ -31,7 +31,10 @@ def test_system_user_connectivity_util(system_user, assets, task_name): """ from ops.utils import update_or_create_ansible_task - hosts = clean_ansible_task_hosts(assets, system_user=system_user) + # hosts = clean_ansible_task_hosts(assets, system_user=system_user) + # TODO: 这里不传递系统用户,因为clean_ansible_task_hosts会通过system_user来判断是否可以推送, + # 不符合测试可连接性逻辑, 后面需要优化此逻辑 + hosts = clean_ansible_task_hosts(assets) if not hosts: return {} platform_hosts_map = {} diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 6610d0082..b6b9f74fc 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index cf964535c..10985029e 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -756,7 +756,7 @@ msgstr "定期测试管理账号可连接性: {}" #: assets/tasks/admin_user_connectivity.py:67 msgid "Test admin user connectivity: {}" -msgstr "测试管理行号可连接性: {}" +msgstr "测试管理帐号可连接性: {}" #: assets/tasks/asset_connectivity.py:27 msgid "Test assets connectivity"