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
This commit is contained in:
Brian Coca 2016-11-04 15:26:50 -04:00 committed by Brian Coca
parent 28dc527b2c
commit 8217c1c39c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ from ansible.module_utils._text import to_bytes, to_text
from ansible.parsing.utils.addresses import parse_address from ansible.parsing.utils.addresses import parse_address
from ansible.plugins import vars_loader from ansible.plugins import vars_loader
from ansible.utils.vars import combine_vars from ansible.utils.vars import combine_vars
from ansible.utils.path import unfrackpath
try: try:
from __main__ import display from __main__ import display
@ -58,7 +59,7 @@ class Inventory(object):
# the host file file, or script path, or list of hosts # the host file file, or script path, or list of hosts
# if a list, inventory data will NOT be loaded # 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._loader = loader
self._variable_manager = variable_manager self._variable_manager = variable_manager
self.localhost = None self.localhost = None

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

@ -26,10 +26,9 @@ from ansible.module_utils._text import to_bytes, to_native, to_text
__all__ = ['unfrackpath', 'makedirs_safe'] __all__ = ['unfrackpath', 'makedirs_safe']
def unfrackpath(path): def unfrackpath(path, follow=True):
''' '''
Returns a path that is free of symlinks, environment Returns a path that is free of symlinks (if follow=True), environment variables, relative path traversals and symbols (~)
variables, relative path traversals and symbols (~)
:arg path: A byte or text string representing a path to be canonicalized :arg path: A byte or text string representing a path to be canonicalized
:raises UnicodeDecodeError: If the canonicalized version of the path :raises UnicodeDecodeError: If the canonicalized version of the path
@ -41,9 +40,13 @@ def unfrackpath(path):
example:: example::
'$HOME/../../var/mail' becomes '/var/spool/mail' '$HOME/../../var/mail' becomes '/var/spool/mail'
''' '''
canonical_path = os.path.normpath(os.path.realpath(os.path.expanduser(os.path.expandvars(to_bytes(path, errors='surrogate_or_strict')))))
return to_text(canonical_path, errors='surrogate_or_strict')
if follow:
final_path = os.path.normpath(os.path.realpath(os.path.expanduser(os.path.expandvars(to_bytes(path, errors='surrogate_or_strict')))))
else:
final_path = os.path.normpath(os.path.abspath(os.path.expanduser(os.path.expandvars(to_bytes(path, errors='surrogate_or_strict')))))
return to_text(final_path, errors='surrogate_or_strict')
def makedirs_safe(path, mode=None): def makedirs_safe(path, mode=None):
'''Safe way to create dirs in muliprocess/thread environments. '''Safe way to create dirs in muliprocess/thread environments.