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

resolve inventory path on init

Browse source 
This allows meta refresh_inventory to work with relative paths
Added option to unfrackpath to not resolv symlinks
fixes #16857

(cherry picked from commit 8217c1c39c)
This commit is contained in:
Brian Coca 2016-11-04 15:26:50 -04:00
parent 00c48637b0
commit f99060b3b9
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,8 +37,7 @@ from ansible.plugins import vars_loader
from ansible.utils.unicode import to_unicode, to_bytes
from ansible.utils.vars import combine_vars
from ansible.parsing.utils.addresses import parse_address
HOSTS_PATTERNS_CACHE = {}
from ansible.utils.path import unfrackpath
try:
from __main__ import display
@ -55,7 +54,7 @@ class Inventory(object):
# the host file file, or script path, or list of hosts
# if a list, inventory data will NOT be loaded
self.host_list = host_list
self.host_list = unfrackpath(host_list, follow=False)
self._loader = loader
self._variable_manager = variable_manager
self.localhost = None

25
lib/ansible/utils/path.py
View file

@ -23,14 +23,27 @@ from ansible.utils.unicode import to_bytes
__all__ = ['unfrackpath']
def unfrackpath(path):
def unfrackpath(path, follow=True):
'''
returns a path that is free of symlinks, environment
variables, relative path traversals and symbols (~)
example:
'$HOME/../../var/mail' becomes '/var/spool/mail'
Returns a path that is free of symlinks (if follow=True), environment variables, relative path traversals and symbols (~)
:arg path: A byte or text string representing a path to be canonicalized
:raises UnicodeDecodeError: If the canonicalized version of the path
contains non-utf8 byte sequences.
:rtype: A text string (unicode on pyyhon2, str on python3).
:returns: An absolute path with symlinks, environment variables, and tilde
expanded. Note that this does not check whether a path exists.
example::
'$HOME/../../var/mail' becomes '/var/spool/mail'
'''
return os.path.normpath(os.path.realpath(os.path.expanduser(os.path.expandvars(path))))
if follow:
final_path = os.path.normpath(os.path.realpath(os.path.expanduser(os.path.expandvars(path))))
else:
final_path = os.path.normpath(os.path.abspath(os.path.expanduser(os.path.expandvars(path))))
return final_path
def makedirs_safe(path, mode=None):
'''Safe way to create dirs in muliprocess/thread environments'''