openstack
/
openstack-ansible-plugins
Code Issues Proposed changes

Merge "Remove deprecated first_available_file"

This commit is contained in:
Jenkins 2016-10-20 17:38:48 +00:00 committed by Gerrit Code Review
parent 58b67c57b9 2f6cac2cf6
commit d364f1bb27
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
action/_v2_config_template.py
View File

@ -419,36 +419,25 @@ class ActionModule(ActionBase):
# Access to protected method is unavoidable in Ansible # Access to protected method is unavoidable in Ansible
searchpath = [self._loader._basedir] searchpath = [self._loader._basedir]
faf = self._task.first_available_file if self._task._role:
if faf: file_path = self._task._role._role_path
task_file = task_vars.get('_original_file', None, 'templates') searchpath.insert(1, C.DEFAULT_ROLES_PATH)
source = self._get_first_available_file(faf, task_file) searchpath.insert(1, self._task._role._role_path)
if not source:
return False, dict(
failed=True,
msg="could not find src in first_available_file list"
)
else: else:
# Access to protected method is unavoidable in Ansible file_path = self._loader.get_basedir()
if self._task._role:
file_path = self._task._role._role_path
searchpath.insert(1, C.DEFAULT_ROLES_PATH)
searchpath.insert(1, self._task._role._role_path)
else:
file_path = self._loader.get_basedir()
user_source = self._task.args.get('src') user_source = self._task.args.get('src')
if not user_source: if not user_source:
return False, dict( return False, dict(
failed=True, failed=True,
msg="No user provided [ src ] was provided" msg="No user provided [ src ] was provided"
)
source = self._loader.path_dwim_relative(
file_path,
'templates',
user_source
) )
searchpath.insert(1, os.path.dirname(source)) source = self._loader.path_dwim_relative(
file_path,
'templates',
user_source
)
searchpath.insert(1, os.path.dirname(source))
_dest = self._task.args.get('dest') _dest = self._task.args.get('dest')
list_extend = self._task.args.get('list_extend') list_extend = self._task.args.get('list_extend')