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

remove group_by from inventory source

Browse Source 
* Does not remove group_by testing
This commit is contained in:
Chris Meyers
2020-07-27 10:46:42 -04:00
committed by Ryan Petrello
parent e11040f421
commit 7278e7c025
7 changed files with 10 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/metadata.py
View File

@@ -122,12 +122,6 @@ class Metadata(metadata.SimpleMetadata):
get_regions = getattr(InventorySource, 'get_%s_region_choices' % cp)
field_info['%s_region_choices' % cp] = get_regions()
# Special handling of group_by choices for EC2.
if field.field_name == 'group_by':
for cp in ('ec2',):
get_group_by_choices = getattr(InventorySource, 'get_%s_group_by_choices' % cp)
field_info['%s_group_by_choices' % cp] = get_group_by_choices()
# Special handling of notification configuration where the required properties
# are conditional on the type selected.
if field.field_name == 'notification_configuration':

2
awx/api/serializers.py
View File

@@ -1937,7 +1937,7 @@ class InventorySourceOptionsSerializer(BaseSerializer):
class Meta:
fields = ('*', 'source', 'source_path', 'source_script', 'source_vars', 'credential',
'source_regions', 'instance_filters', 'group_by', 'overwrite', 'overwrite_vars',
'source_regions', 'instance_filters', 'overwrite', 'overwrite_vars',
'custom_virtualenv', 'timeout', 'verbosity')
def get_related(self, obj):