shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 06:51:10 +03:00
Code Releases Activity

Merge pull request #199 from AlanCoding/inv_no_yaml

Browse Source 
Inventory file suggestion adjustments from user feedback
This commit is contained in:
Alan Rominger 2017-09-19 08:40:20 -04:00 committed by GitHub
commit bc4b622e6b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/utils/ansible.py
View File

@ -61,10 +61,14 @@ def could_be_playbook(project_path, dir_path, filename):
def could_be_inventory(project_path, dir_path, filename):
# Decisions based exclusively on filename
inventory_path = os.path.join(dir_path, filename)
inventory_rel_path = os.path.relpath(inventory_path, smart_str(project_path))
suspected_ext = os.path.splitext(filename)[-1]
if suspected_ext in ['.yml', '.yaml', '.ini'] or os.access(inventory_path, os.X_OK):
if filename in ['inventory', 'hosts']:
# Users commonly name their inventory files these names
return inventory_rel_path
elif suspected_ext == '.ini' or os.access(inventory_path, os.X_OK):
# Files with any of these extensions are always included
return os.path.relpath(inventory_path, smart_str(project_path))
return inventory_rel_path
elif '.' in suspected_ext:
# If not using those extensions, inventory must have _no_ extension
return None
@ -79,4 +83,4 @@ def could_be_inventory(project_path, dir_path, filename):
return None
except IOError:
return None
return os.path.relpath(inventory_path, smart_str(project_path))
return inventory_rel_path