Commit 32628eef by James Cammarata

Merge pull request #7481 from jimi-c/issue_7396_env_lookup

Don't use listify_ function, when all we want to do is template variable...
parents 062e8293 365bfd73
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
from ansible import utils, errors from ansible import utils, errors
from ansible.utils import template
import os import os
class LookupModule(object): class LookupModule(object):
...@@ -25,7 +26,10 @@ class LookupModule(object): ...@@ -25,7 +26,10 @@ class LookupModule(object):
def run(self, terms, inject=None, **kwargs): def run(self, terms, inject=None, **kwargs):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject) try:
terms = template.template(self.basedir, terms, inject)
except Exception, e:
pass
if isinstance(terms, basestring): if isinstance(terms, basestring):
terms = [ terms ] terms = [ terms ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment