|
|
|
@ -110,15 +110,17 @@ def main(args):
|
|
|
|
|
su_pass = None
|
|
|
|
|
vault_pass = None
|
|
|
|
|
|
|
|
|
|
if not options.listhosts and not options.syntax and not options.listtasks:
|
|
|
|
|
options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
|
|
|
|
|
options.ask_vault_pass = options.ask_vault_pass or C.DEFAULT_ASK_VAULT_PASS
|
|
|
|
|
|
|
|
|
|
if options.listhosts or options.syntax or options.listtasks:
|
|
|
|
|
(_, _, _, vault_pass) = utils.ask_passwords(ask_vault_pass=options.ask_vault_pass)
|
|
|
|
|
else:
|
|
|
|
|
options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
|
|
|
|
|
# Never ask for an SSH password when we run with local connection
|
|
|
|
|
if options.connection == "local":
|
|
|
|
|
options.ask_pass = False
|
|
|
|
|
options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS
|
|
|
|
|
options.ask_su_pass = options.ask_su_pass or C.DEFAULT_ASK_SU_PASS
|
|
|
|
|
options.ask_vault_pass = options.ask_vault_pass or C.DEFAULT_ASK_VAULT_PASS
|
|
|
|
|
(sshpass, sudopass, su_pass, vault_pass) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass, ask_su_pass=options.ask_su_pass, ask_vault_pass=options.ask_vault_pass)
|
|
|
|
|
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
|
|
|
|
|
options.su_user = options.su_user or C.DEFAULT_SU_USER
|
|
|
|
@ -207,7 +209,8 @@ def main(args):
|
|
|
|
|
playnum = 0
|
|
|
|
|
for (play_ds, play_basedir) in zip(pb.playbook, pb.play_basedirs):
|
|
|
|
|
playnum += 1
|
|
|
|
|
play = ansible.playbook.Play(pb, play_ds, play_basedir)
|
|
|
|
|
play = ansible.playbook.Play(pb, play_ds, play_basedir,
|
|
|
|
|
vault_password=pb.vault_password)
|
|
|
|
|
label = play.name
|
|
|
|
|
hosts = pb.inventory.list_hosts(play.hosts)
|
|
|
|
|
|
|
|
|
|