Improved 'vars_prompt' syntax to support prompt text and (non-)private input

An example of the new syntax:

vars_prompt:
 - name: 'secret_variable_name"
   prompt: "Enter secret value: "
   private: "yes"
 - name: "nonsecret_variable_name"
   prompt: "Enter non-secret value: "
   private: "no"
This commit is contained in:
Petros Moisiadis 2012-07-24 17:43:29 +03:00 committed by Michael DeHaan
commit c717934b7e
3 changed files with 42 additions and 10 deletions

View file

@ -155,10 +155,26 @@ class Play(object):
else:
vars.update(self.vars)
if type(self.vars_prompt) != dict:
raise errors.AnsibleError("'vars_prompt' section must contain only key/value pairs")
for vname in self.vars_prompt:
vars[vname] = self.playbook.callbacks.on_vars_prompt(vname)
if type(self.vars_prompt) == list:
for var in self.vars_prompt:
try:
vname = var.get("name")
except KeyError:
raise errors.AnsibleError("A variable dictionary in 'vars_prompt' must always have a 'name' key")
if not ((vname[0].isalpha() or vname[0] == '_') and vname.replace('_','').isalnum()):
raise errors.AnsibleError("'%s' cannot be used as a variable name. Variable names must consist of"
" a letter or underscore, followed by a string of letters, numbers, and underscores"
% vname)
prompt = var.get("prompt", None)
private = var.get("private", True)
vars[vname] = self.playbook.callbacks.on_vars_prompt(vname, private, prompt)
elif type(self.vars_prompt) == dict:
for vname in self.vars_prompt:
vars[vname] = self.playbook.callbacks.on_vars_prompt(vname)
else:
raise errors.AnsibleError("'vars_prompt' section must contain either key/value pairs or a list"
" of variable dictionaries (see docs for accepted dictionary keys)")
results = self.playbook.extra_vars.copy()
results.update(vars)