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

Directory loads for inventory import

Browse Source
This commit is contained in:
Michael DeHaan
2013-07-14 16:30:15 -04:00
parent 8f1337128f
commit 43415947d0
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import sys
from optparse import make_option from optparse import make_option
import subprocess import subprocess
import traceback import traceback
import glob
# Django # Django
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
@@ -47,7 +48,6 @@ class MemGroup(object):
self.parents = [] self.parents = []
group_vars = os.path.join(inventory_base, 'group_vars', name) group_vars = os.path.join(inventory_base, 'group_vars', name)
print "LOOKING FOR: %s" % group_vars
if os.path.exists(group_vars): if os.path.exists(group_vars):
LOGGER.debug("loading group_vars") LOGGER.debug("loading group_vars")
self.variables = yaml.load(open(group_vars).read()) self.variables = yaml.load(open(group_vars).read())
@@ -149,19 +149,6 @@ class BaseLoader(object):
group_names[name] = group group_names[name] = group
return group_names[name] return group_names[name]
class DirectoryLoader(BaseLoader):
def __init__(self):
LOGGER.debug("processing directory")
pass
def load(self, src, all_group):
self.inventory_base = dirname
# now go through converts and use IniLoader or ExecutableJsonLoader
# as needed but pass them in the inventory_base or src so group_vars can load
class IniLoader(BaseLoader): class IniLoader(BaseLoader):
def __init__(self, inventory_base=None): def __init__(self, inventory_base=None):
@@ -341,7 +328,15 @@ class GenericLoader(object):
raise ImportException("source does not exist") raise ImportException("source does not exist")
if os.path.isdir(src): if os.path.isdir(src):
self.memGroup = memGroup = MemGroup('all', src) self.memGroup = memGroup = MemGroup('all', src)
DirectoryLoader().load(src, memGroup) for f in glob.glob("%s/*" % src):
if f.endswith(".ini"):
# config files for inventory scripts should be ignored
pass
if not os.path.isdir(f):
if os.access(f, os.X_OK):
ExecutableJsonLoader().load(f, memGroup)
else:
IniLoader().load(f, memGroup)
elif os.access(src, os.X_OK): elif os.access(src, os.X_OK):
self.memGroup = memGroup = MemGroup('all', os.path.dirname(src)) self.memGroup = memGroup = MemGroup('all', os.path.dirname(src))
ExecutableJsonLoader().load(src, memGroup) ExecutableJsonLoader().load(src, memGroup)