diff --git a/jperm/utils.py b/jperm/utils.py index 9ba37efb3..cbe4b53da 100644 --- a/jperm/utils.py +++ b/jperm/utils.py @@ -108,7 +108,7 @@ def get_add_sudo_script(sudo_chosen_aliase, sudo_chosen_obj): sudo_file = NamedTemporaryFile(delete=False) sudo_file.write(sudo_content) sudo_file.close() - + print(sudo_file.name) return sudo_file.name diff --git a/jperm/views.py b/jperm/views.py index e095c8a0a..445d82845 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -356,7 +356,6 @@ def perm_role_edit(request): if request.method == "GET": return my_render('jperm/perm_role_edit.html', locals(), request) - if request.method == "POST": # 获取 POST 数据 role_name = request.POST.get("role_name") @@ -423,23 +422,25 @@ def perm_role_push(request): group_assets_obj = [] for asset_group in asset_groups_obj: group_assets_obj.extend(asset_group.asset_set.all()) - calc_assets = set(assets_obj) | set(group_assets_obj) + calc_assets = list(set(assets_obj) | set(group_assets_obj)) # 生成Inventory - push_resource = [] - for asset in calc_assets: - if asset.use_default_auth: - username = Setting.field1 - port = Setting.field2 - password = Setting.field3 - else: - username = asset.username - password = asset.password - port = asset.port - push_resource.append({"hostname": asset.ip, - "port": port, - "username": username, - "password": password}) + # push_resource = [] + # for asset in calc_assets: + # if asset.use_default_auth: + # username = Setting.field1 + # port = Setting.field2 + # password = Setting.field3 + # else: + # username = asset.username + # password = asset.password + # port = asset.port + # push_resource.append({"hostname": asset.ip, + # "port": port, + # "username": username, + # "password": password}) + push_resource = gen_resource(calc_assets) + print push_resource # 获取角色的推送方式,以及推送需要的信息 roles_obj = [PermRole.objects.get(name=role_name) for role_name in role_names] @@ -486,7 +487,9 @@ def perm_role_push(request): if ret_sudo["step1"] != "ok" or ret_sudo["step2"] != "ok": ret_failed["step3"] = "failed" - os.remove(add_sudo_script) + # os.remove(add_sudo_script) + + print ret # 结果汇总统计 diff --git a/templates/jperm/perm_sudo_add.html b/templates/jperm/perm_sudo_add.html index 8df34a5ce..a996ae387 100644 --- a/templates/jperm/perm_sudo_add.html +++ b/templates/jperm/perm_sudo_add.html @@ -1,9 +1,4 @@ {% extends 'base.html' %} -{% block self_head_css_js %} - - - -{% endblock %} {% load mytags %} {% block content %} {% include 'nav_cat_bar.html' %} @@ -69,52 +64,7 @@ {% endblock %} {% block self_footer_js %} - - {% endblock %}