External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 19:37:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from chrismeyersfsu/improvement-inventory_import_more_like_ansible

Browse Source 
inventory_import behave more like ansible
This commit is contained in:
Chris Meyers
2015-01-27 15:11:13 -05:00
parent 582bca474c cfb56c25a0
commit 6fba494692
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/management/commands/inventory_import.py
View File

@@ -55,12 +55,16 @@ class MemObject(object):
def load_vars(self, base_path): def load_vars(self, base_path):
all_vars = {} all_vars = {}
files_found = 0
for suffix in ('', '.yml', '.yaml', '.json'): for suffix in ('', '.yml', '.yaml', '.json'):
path = ''.join([base_path, suffix]) path = ''.join([base_path, suffix])
if not os.path.exists(path): if not os.path.exists(path):
continue continue
if not os.path.isfile(path): if not os.path.isfile(path):
continue continue
files_found += 1
if files_found > 1:
raise RuntimeError('Multiple variable files found. There should only be one. %s ' % self.name)
vars_name = os.path.basename(os.path.dirname(path)) vars_name = os.path.basename(os.path.dirname(path))
logger.debug('Loading %s from %s', vars_name, path) logger.debug('Loading %s from %s', vars_name, path)
try: try: