diff --git a/jperm/ansible_api.py b/jperm/ansible_api.py index 0b54ffd58..bcd64dee8 100644 --- a/jperm/ansible_api.py +++ b/jperm/ansible_api.py @@ -442,23 +442,8 @@ class Tasks(Command): :return: """ module_args1 = file_path - ret1 = self.__run(module_args1, "script") - module_args2 = 'visudo -c | grep "parsed OK" &> /dev/null && echo "ok" || echo "failed"' - ret2 = self.__run(module_args2, "shell") - ret2_status = [host_value.get("stdout") for host_value in ret2["result"]["contacted"].values()] - - result = {} - if not ret1["msg"]: - result["step1"] = "ok" - else: - result["msg"] = ret1["msg"] - - if not ret2["msg"] and "failed" not in ret2_status: - result["step2"] = "ok" - else: - result["msg"] = ret1["msg"] - - return result + ret = self.__run(module_args1, "script") + return ret class CustomAggregateStats(callbacks.AggregateStats): diff --git a/jperm/views.py b/jperm/views.py index 38a003859..c5ac24cc6 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -410,25 +410,8 @@ def perm_role_push(request): for asset_group in asset_groups_obj: group_assets_obj.extend(asset_group.asset_set.all()) 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 = gen_resource(calc_assets) - - logger.debug('推送role res: %s' % push_resource) + logger.debug('Push role res: %s' % push_resource) # 调用Ansible API 进行推送 password_push = True if request.POST.get("use_password") else False @@ -463,7 +446,7 @@ def perm_role_push(request): if ret['sudo'].get('msg'): ret_failed = ret['sudo'].get('msg') - os.remove(add_sudo_script) + # os.remove(add_sudo_script) logger.debug('推送role结果: %s' % ret) logger.debug('推送role错误: %s' % ret_failed) diff --git a/templates/jperm/perm_role_detail.html b/templates/jperm/perm_role_detail.html index a6cb9ad11..449e0f84a 100644 --- a/templates/jperm/perm_role_detail.html +++ b/templates/jperm/perm_role_detail.html @@ -204,7 +204,7 @@