External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-03 15:45:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2677 from ryanpetrello/non-exclusive-policy-instance-list

Browse Source 
make InstanceGroup.policy_instance_list non-exclusive by default
This commit is contained in:
Ryan Petrello
2018-07-25 21:10:15 -04:00
committed by GitHub
parent 76d83b0acb 15aaca8f03
commit 57fdbc1853
7 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -4617,7 +4617,7 @@ class InstanceSerializer(BaseSerializer):
read_only_fields = ('uuid', 'hostname', 'version')
fields = ("id", "type", "url", "related", "uuid", "hostname", "created", "modified", 'capacity_adjustment',
"version", "capacity", "consumed_capacity", "percent_capacity_remaining", "jobs_running", "jobs_total",
"cpu", "memory", "cpu_capacity", "mem_capacity", "enabled")
"cpu", "memory", "cpu_capacity", "mem_capacity", "enabled", "managed_by_policy")
def get_related(self, obj):
res = super(InstanceSerializer, self).get_related(obj)