External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-30 09:29:54 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix a bug in the instance policy algorithm when both min and % are used

Browse Source 
see: https://github.com/ansible/tower/issues/897
This commit is contained in:
Ryan Petrello
2018-05-24 12:28:46 -04:00
parent 019a07f919
commit 870adc14f9
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -175,6 +175,10 @@ def apply_cluster_membership_policies(self):
# Finally process instance policy percentages
for g in sorted(actual_groups, cmp=lambda x,y: len(x.instances) - len(y.instances)):
for i in sorted(actual_instances, cmp=lambda x,y: len(x.groups) - len(y.groups)):
if i.obj.id in g.instances:
# If the instance is already _in_ the group, it was
# probably applied earlier via a minimum policy
continue
if 100 * float(len(g.instances)) / len(actual_instances) >= g.obj.policy_instance_percentage:
break
logger.info(six.text_type("Policy percentage, adding Instance {} to Group {}").format(i.obj.hostname, g.obj.name))