Merge pull request #42 from dochang/pass-args

* pass-args: Pass `ask_vault_pass` and `become_method` to `utils.ask_passwords`.
spencergibb · Nov 5, 2015 · 77068d3 · 77068d3
2 parents 3311fd3 + 24d8a74
commit 77068d3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/battleschool/main.py b/lib/battleschool/main.py
@@ -129,7 +129,8 @@ def main(args, battleschool_dir=None):
     if not options.listhosts and not options.syntax and not options.listtasks:
         options.ask_pass = AC.DEFAULT_ASK_PASS
         options.ask_sudo_pass = options.ask_sudo_pass or AC.DEFAULT_ASK_SUDO_PASS
-        passwds = utils.ask_passwords(ask_pass=options.ask_pass, become_ask_pass=options.ask_sudo_pass)
+        options.become_method = options.become_method or AC.DEFAULT_BECOME_METHOD
+        passwds = utils.ask_passwords(ask_pass=options.ask_pass, become_ask_pass=options.ask_sudo_pass, ask_vault_pass=options.ask_vault_pass, become_method=options.become_method)
         sshpass = passwds[0]
         sudopass = passwds[1]
         vault_pass = passwds[2]