From e7af0054084f825be5498b03effa0bce71b67e3b Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Fri, 28 Sep 2012 01:32:09 +0200 Subject: [PATCH] Revert only_if for variables and templating prompt Since the condition was not templated, it wasn't working. Only variables in local scope were used, which made this not very practical --- lib/ansible/playbook/play.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 834f28fd5c4..d02cfc0d130 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -165,17 +165,15 @@ class Play(object): raise errors.AnsibleError("'vars_prompt' item is missing 'name:'") vname = var['name'] - prompt = utils.template(None, "%s: " % var.get("prompt", vname), self.vars) + prompt = var.get("prompt", vname) private = var.get("private", True) confirm = var.get("confirm", False) encrypt = var.get("encrypt", None) salt_size = var.get("salt_size", None) salt = var.get("salt", None) - conditional = var.get("only_if", 'True') - if utils.check_conditional(conditional): - vars[vname] = self.playbook.callbacks.on_vars_prompt(vname, private, prompt,encrypt, confirm, salt_size, salt) + vars[vname] = self.playbook.callbacks.on_vars_prompt(vname, private, prompt,encrypt, confirm, salt_size, salt) elif type(self.vars_prompt) == dict: for (vname, prompt) in self.vars_prompt.iteritems():