Commit 2f1fc3e0 by Brian Coca

Merge pull request #10100 from ansible/revert-9834-fix-variables-with-dashes

Revert "Support variable values with dashes"
parents 13bbf9bf 9d190c8d
...@@ -269,7 +269,7 @@ def check_conditional(conditional, basedir, inject, fail_on_undefined=False): ...@@ -269,7 +269,7 @@ def check_conditional(conditional, basedir, inject, fail_on_undefined=False):
conditional = conditional.replace("jinja2_compare ","") conditional = conditional.replace("jinja2_compare ","")
# allow variable names # allow variable names
if conditional in inject: if conditional in inject and '-' not in str(inject[conditional]):
conditional = inject[conditional] conditional = inject[conditional]
conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined) conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined)
original = str(conditional).replace("jinja2_compare ","") original = str(conditional).replace("jinja2_compare ","")
......
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