Merge pull request #2614 from stokkie90/devel

Fixed bug where all group variables are not included

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/main/models/inventory.py

@@ -294,6 +294,8 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
 
         # Remove any empty groups
         for group_name in list(data.keys()):
+            if group_name == 'all':
+                continue
             if not (data.get(group_name, {}).get('hosts', []) or data.get(group_name, {}).get('children', [])):
                 data.pop(group_name)