summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-01-26 12:54:50 -0500
committerBrian Coca <bcoca@ansible.com>2015-01-26 12:54:50 -0500
commit9d190c8d8d3ed33c75237943282ffbb8065a9d51 (patch)
treeebf5aed351f10306c303272f7a471bf18a8b4454
parent13bbf9bfbb4669706a28f478feda6c4c505b9efd (diff)
downloadansible-revert-9834-fix-variables-with-dashes.tar.gz
Revert "Support variable values with dashes"revert-9834-fix-variables-with-dashes
-rw-r--r--lib/ansible/utils/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py
index 7879f5a0a6..44db63e276 100644
--- a/lib/ansible/utils/__init__.py
+++ b/lib/ansible/utils/__init__.py
@@ -269,7 +269,7 @@ def check_conditional(conditional, basedir, inject, fail_on_undefined=False):
conditional = conditional.replace("jinja2_compare ","")
# allow variable names
- if conditional in inject:
+ if conditional in inject and '-' not in str(inject[conditional]):
conditional = inject[conditional]
conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined)
original = str(conditional).replace("jinja2_compare ","")