From b622aca9afaee1d33e5afff46e1a4c6852a912c1 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 8 Jul 2020 10:48:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(admin=5Fuser):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=94=A8=E6=88=B7=E5=8D=95=E7=8B=AC=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=9F=90=E5=8F=B0=E8=B5=84=E4=BA=A7=E5=8F=AF=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=80=A7=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=EF=BC=88private=5Fkey=5Ffile)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks/asset_user_connectivity.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 54242 -> 54242 bytes apps/locale/zh/LC_MESSAGES/django.po | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) 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/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 6610d0082837075b808418be5a24e3eea99c6ae2..b6b9f74fc3b3d15ae732dfa0281da50380a9962b 100644 GIT binary patch delta 18 acmaE~ocYmm<_%d#n4j*LusQcgDL(*ST?vl> delta 18 acmaE~ocYmm<_%d#m|raH*_?Z%lpg?Hya{&z 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" From 8c7240193ad6d0788e55022a36beb10091cca3d5 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 8 Jul 2020 11:30:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(system=5Fuser):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=B5=8B=E8=AF=95=E5=8F=AF?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=80=A7=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88=E6=89=80=E6=9C=89=E8=B5=84=E4=BA=A7=EF=BC=89=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=89=A7=E8=A1=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=8E=A8=E9=80=81=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks/system_user_connectivity.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 = {}