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

Merge pull request #427 from AlanCoding/inv_for_the_people

Browse Source 
Inventory file suggestion adjustments from user feedback
This commit is contained in:
Alan Rominger
2017-09-19 10:36:02 -04:00
committed by GitHub
parent 458779d897 120b5297e3
commit 88ffb32d4f
1 changed files with 7 additions and 3 deletions
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): def could_be_inventory(project_path, dir_path, filename):
# Decisions based exclusively on filename # Decisions based exclusively on filename
inventory_path = os.path.join(dir_path, 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] 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 # 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: elif '.' in suspected_ext:
# If not using those extensions, inventory must have _no_ extension # If not using those extensions, inventory must have _no_ extension
return None return None
@@ -79,4 +83,4 @@ def could_be_inventory(project_path, dir_path, filename):
return None return None
except IOError: except IOError:
return None return None
return os.path.relpath(inventory_path, smart_str(project_path)) return inventory_rel_path