cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added workaround for inventory directories

Browse source
This commit is contained in:
Vytis Valentinavičius 2015-12-15 15:38:56 +02:00
parent 54d4225e23
commit e856ac2320
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/inventory/__init__.py
View file

@ -559,11 +559,20 @@ class Inventory(object):
return False
return os.path.exists(self.host_list)
def is_dir(self):
""" did inventory come from a directory? """
if not isinstance(self.host_list, basestring):
return False
return os.path.isdir(self.host_list)
def basedir(self):
""" if inventory came from a file, what's the directory? """
if not self.is_file():
return None
dname = os.path.dirname(self.host_list)
if self.is_dir():
dname = os.path.dirname(os.path.dirname(self.host_list))
else:
dname = os.path.dirname(self.host_list)
if dname is None or dname == '' or dname == '.':
cwd = os.getcwd()
return os.path.abspath(cwd)