Merge pull request #199 from t-woerner/ipahbacrule_fix_members

ipahbacrule: Fix handing of members with action hbacrule
This commit is contained in:
Rafael Guterres Jeffman
2020-02-07 15:58:03 -03:00
committed by GitHub
2 changed files with 525 additions and 234 deletions

View File

@@ -344,41 +344,41 @@ def main():
# Generate addition and removal lists
host_add = list(
set(host or []) -
set(res_find.get("member_host", [])))
set(res_find.get("memberhost_host", [])))
host_del = list(
set(res_find.get("member_host", [])) -
set(res_find.get("memberhost_host", [])) -
set(host or []))
hostgroup_add = list(
set(hostgroup or []) -
set(res_find.get("member_hostgroup", [])))
set(res_find.get("memberhost_hostgroup", [])))
hostgroup_del = list(
set(res_find.get("member_hostgroup", [])) -
set(res_find.get("memberhost_hostgroup", [])) -
set(hostgroup or []))
hbacsvc_add = list(
set(hbacsvc or []) -
set(res_find.get("member_hbacsvc", [])))
set(res_find.get("memberservice_hbacsvc", [])))
hbacsvc_del = list(
set(res_find.get("member_hbacsvc", [])) -
set(res_find.get("memberservice_hbacsvc", [])) -
set(hbacsvc or []))
hbacsvcgroup_add = list(
set(hbacsvcgroup or []) -
set(res_find.get("member_hbacsvcgroup", [])))
set(res_find.get("memberservice_hbacsvcgroup", [])))
hbacsvcgroup_del = list(
set(res_find.get("member_hbacsvcgroup", [])) -
set(res_find.get("memberservice_hbacsvcgroup", [])) -
set(hbacsvcgroup or []))
user_add = list(
set(user or []) -
set(res_find.get("member_user", [])))
set(res_find.get("memberuser_user", [])))
user_del = list(
set(res_find.get("member_user", [])) -
set(res_find.get("memberuser_user", [])) -
set(user or []))
group_add = list(
set(group or []) -
set(res_find.get("member_group", [])))
set(res_find.get("memberuser_group", [])))
group_del = list(
set(res_find.get("member_group", [])) -
set(res_find.get("memberuser_group", [])) -
set(group or []))
# Add hosts and hostgroups