From 88c10e851b799884f72964a37ac5522cb52df2a1 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 7 Mar 2018 21:24:13 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/forms/asset.py | 9 ++- apps/assets/tasks.py | 14 ++++- .../templates/assets/system_user_asset.html | 2 +- .../templates/assets/system_user_detail.html | 4 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29810 -> 29902 bytes apps/i18n/zh/LC_MESSAGES/django.po | 52 +++++++++--------- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py index 34865c544..ce3e3fb56 100644 --- a/apps/assets/forms/asset.py +++ b/apps/assets/forms/asset.py @@ -34,9 +34,11 @@ class AssetCreateForm(forms.ModelForm): 'hostname': '* required', 'ip': '* required', 'port': '* required', - 'admin_user': _('Admin user is a privilege user exist on this asset,' - 'Example: root or other NOPASSWD sudo privilege user' - ) + 'admin_user': _( + 'Admin user is a privilege user exist on this asset,' + 'Example: root or other NOPASSWD sudo privilege user' + 'If asset not support ansible, set any one' + ) } @@ -67,6 +69,7 @@ class AssetUpdateForm(forms.ModelForm): 'admin_user': _( 'Admin user is a privilege user exist on this asset,' 'Example: root or other NOPASSWD sudo privilege user' + 'If asset not support ansible, set any one' ) } diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index a20ab3a74..3f792a080 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -343,8 +343,12 @@ def push_system_user_util(system_users, assets, task_name): from ops.utils import update_or_create_ansible_task tasks = [] for system_user in system_users: - if system_user.is_need_push(): - tasks.extend(get_push_system_user_tasks(system_user)) + if not system_user.is_need_push(): + msg = "push system user `{}` passed, may be not auto push or ssh " \ + "protocol is not ssh".format(system_user.name) + logger.info(msg) + continue + tasks.extend(get_push_system_user_tasks(system_user)) if not tasks: logger.info("Not tasks, passed") @@ -376,6 +380,12 @@ def push_system_user_to_node(system_user, node): @shared_task def push_system_user_related_nodes(system_user): + if not system_user.is_need_push(): + msg = "push system user `{}` passed, may be not auto push or ssh " \ + "protocol is not ssh".format(system_user.name) + logger.info(msg) + return + nodes = system_user.nodes.all() for node in nodes: push_system_user_to_node(system_user, node) diff --git a/apps/assets/templates/assets/system_user_asset.html b/apps/assets/templates/assets/system_user_asset.html index f82f97ab8..4ac3a5e04 100644 --- a/apps/assets/templates/assets/system_user_asset.html +++ b/apps/assets/templates/assets/system_user_asset.html @@ -67,7 +67,7 @@ - + - + {% if system_user.auto_push %} + + {% endif %}
{% trans 'Push system user manually' %}:{% trans 'Push system user now' %}: diff --git a/apps/assets/templates/assets/system_user_detail.html b/apps/assets/templates/assets/system_user_detail.html index c655436b9..28d792bd2 100644 --- a/apps/assets/templates/assets/system_user_detail.html +++ b/apps/assets/templates/assets/system_user_detail.html @@ -131,7 +131,8 @@
{% trans 'Push system user manually' %}:{% trans 'Push system user now' %}: @@ -139,6 +140,7 @@
{% trans 'Test assets connective' %}: diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 2861b01286de4833fc9ab469d9fbb629eaa7b721..7a57574601761d81d519e18651860e9a014d90af 100644 GIT binary patch delta 7792 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 I;Wrch2UCcB-2eap diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index 2a98c8c0c..ff95b3eab 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-07 11:54+0800\n" +"POT-Creation-Date: 2018-03-07 21:18+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -21,40 +21,42 @@ msgstr "" msgid "New node {}" msgstr "新节点 {}" -#: assets/forms/asset.py:23 assets/forms/asset.py:52 assets/forms/user.py:125 +#: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/forms/user.py:125 #: assets/models/asset.py:53 assets/models/user.py:218 #: assets/templates/assets/asset_detail.html:181 #: assets/templates/assets/asset_detail.html:189 -#: assets/templates/assets/system_user_detail.html:164 +#: assets/templates/assets/system_user_detail.html:166 msgid "Nodes" msgstr "节点管理" -#: assets/forms/asset.py:26 assets/forms/asset.py:55 assets/forms/asset.py:90 -#: assets/forms/asset.py:94 assets/models/asset.py:57 +#: assets/forms/asset.py:26 assets/forms/asset.py:57 assets/forms/asset.py:93 +#: assets/forms/asset.py:97 assets/models/asset.py:57 #: assets/models/cluster.py:19 assets/models/user.py:187 #: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24 msgid "Admin user" msgstr "管理用户" -#: assets/forms/asset.py:29 assets/forms/asset.py:58 assets/models/asset.py:81 +#: assets/forms/asset.py:29 assets/forms/asset.py:60 assets/models/asset.py:81 #: assets/templates/assets/asset_create.html:32 #: assets/templates/assets/asset_detail.html:218 #: assets/templates/assets/asset_update.html:37 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" -#: assets/forms/asset.py:37 assets/forms/asset.py:68 +#: assets/forms/asset.py:38 assets/forms/asset.py:70 msgid "" "Admin user is a privilege user exist on this asset,Example: root or other " -"NOPASSWD sudo privilege user" -msgstr "管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户" +"NOPASSWD sudo privilege userIf asset not support ansible, set any one" +msgstr "" +"管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户, 如果资产" +"不支持ansible, 任意设置一个即可" -#: assets/forms/asset.py:77 assets/forms/asset.py:81 assets/forms/label.py:15 +#: assets/forms/asset.py:80 assets/forms/asset.py:84 assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:242 msgid "Select assets" msgstr "选择资产" -#: assets/forms/asset.py:86 assets/models/asset.py:52 +#: assets/forms/asset.py:89 assets/models/asset.py:52 #: assets/templates/assets/admin_user_assets.html:53 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/system_user_asset.html:51 @@ -62,11 +64,11 @@ msgstr "选择资产" msgid "Port" msgstr "端口" -#: assets/forms/asset.py:106 assets/templates/assets/asset_create.html:36 +#: assets/forms/asset.py:109 assets/templates/assets/asset_create.html:36 msgid "Select labels" msgstr "选择标签" -#: assets/forms/asset.py:109 assets/templates/assets/admin_user_detail.html:91 +#: assets/forms/asset.py:112 assets/templates/assets/admin_user_detail.html:91 msgid "Select nodes" msgstr "选择节点" @@ -454,11 +456,11 @@ msgstr "测试系统用户可连接性: {}" msgid "test system user connectability period: {}" msgstr "测试系统用户可连接性: {}" -#: assets/tasks.py:365 +#: assets/tasks.py:369 msgid "Push system user to node: {} => {}" msgstr "推送系统用户到节点: {}->{}" -#: assets/tasks.py:397 +#: assets/tasks.py:407 msgid "Push system users to node: {}" msgstr "推送系统用户到节点: {}" @@ -748,7 +750,7 @@ msgstr "测试可连接性" #: assets/templates/assets/admin_user_assets.html:75 #: assets/templates/assets/asset_detail.html:170 #: assets/templates/assets/system_user_asset.html:81 -#: assets/templates/assets/system_user_detail.html:145 +#: assets/templates/assets/system_user_detail.html:147 msgid "Test" msgstr "测试" @@ -763,7 +765,7 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:198 #: assets/templates/assets/asset_list.html:541 -#: assets/templates/assets/system_user_detail.html:181 +#: assets/templates/assets/system_user_detail.html:183 #: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16 #: terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:339 @@ -936,27 +938,27 @@ msgid "Assets of " msgstr "资产" #: assets/templates/assets/system_user_asset.html:70 -#: assets/templates/assets/system_user_detail.html:134 -msgid "Push system user manually" -msgstr "手动推送系统" +#: assets/templates/assets/system_user_detail.html:135 +msgid "Push system user now" +msgstr "立刻推送系统" #: assets/templates/assets/system_user_asset.html:73 -#: assets/templates/assets/system_user_detail.html:137 +#: assets/templates/assets/system_user_detail.html:138 msgid "Push" msgstr "推送" #: assets/templates/assets/system_user_asset.html:78 -#: assets/templates/assets/system_user_detail.html:142 +#: assets/templates/assets/system_user_detail.html:144 msgid "Test assets connective" msgstr "测试资产可连接性" #: assets/templates/assets/system_user_asset.html:147 -#: assets/templates/assets/system_user_detail.html:301 +#: assets/templates/assets/system_user_detail.html:303 msgid "Task has been send, Go to ops task list seen result" msgstr "任务已下发，查看ops任务列表" #: assets/templates/assets/system_user_asset.html:159 -#: assets/templates/assets/system_user_detail.html:313 +#: assets/templates/assets/system_user_detail.html:315 msgid "Task has been send, seen left assets status" msgstr "任务已下发，查看左侧资产状态" @@ -968,7 +970,7 @@ msgstr "家目录" msgid "Uid" msgstr "Uid" -#: assets/templates/assets/system_user_detail.html:172 +#: assets/templates/assets/system_user_detail.html:174 msgid "Add to node" msgstr "添加到节点"