diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2016-10-03 18:47:01 -0400 |
|---|---|---|
| committer | Brian Coca <bcoca@users.noreply.github.com> | 2016-10-03 20:23:33 -0400 |
| commit | 125a8d3c65201defa5f1edeef3990839327822fe (patch) | |
| tree | 16ff40d8e10c7351ff35ab6c70dbb1e27dd90698 | |
| parent | 54ce6a9b7a7d2b1d4dc712c74f58fda5f55a780a (diff) | |
| download | ansible-125a8d3c65201defa5f1edeef3990839327822fe.tar.gz | |
no need for warnings in first_found
| -rw-r--r-- | lib/ansible/plugins/lookup/__init__.py | 4 | ||||
| -rw-r--r-- | lib/ansible/plugins/lookup/first_found.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/plugins/lookup/__init__.py b/lib/ansible/plugins/lookup/__init__.py index 908135a4c7..61bbea4505 100644 --- a/lib/ansible/plugins/lookup/__init__.py +++ b/lib/ansible/plugins/lookup/__init__.py @@ -102,7 +102,7 @@ class LookupBase(with_metaclass(ABCMeta, object)): """ pass - def find_file_in_search_path(self, myvars, subdir, needle): + def find_file_in_search_path(self, myvars, subdir, needle, ignore_missing=False): ''' Return a file (needle) in the task's expected search path. ''' @@ -113,7 +113,7 @@ class LookupBase(with_metaclass(ABCMeta, object)): paths = self.get_basedir(myvars) result = self._loader.path_dwim_relative_stack(paths, subdir, needle) - if result is None: + if result is None and not ignore_missing: self._display.warning("Unable to find '%s' in expected paths." % needle) return result diff --git a/lib/ansible/plugins/lookup/first_found.py b/lib/ansible/plugins/lookup/first_found.py index 4fb7e35ea2..43fc3a7a77 100644 --- a/lib/ansible/plugins/lookup/first_found.py +++ b/lib/ansible/plugins/lookup/first_found.py @@ -181,7 +181,7 @@ class LookupModule(LookupBase): # get subdir if set by task executor, default to files otherwise subdir = getattr(self, '_subdir', 'files') path = None - path = self.find_file_in_search_path(variables, subdir, fn) + path = self.find_file_in_search_path(variables, subdir, fn, ignore_missing=True) if path is not None: return [path] else: |