From 6bc2ea1f2bc420231caa3bc40813ea0e7a8b1484 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 5 Jun 2015 12:02:35 -0500 Subject: [PATCH 1/2] Don't empty out become_pass. See #11169 --- lib/ansible/executor/connection_info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/executor/connection_info.py b/lib/ansible/executor/connection_info.py index 424ac062b3..03d9039c49 100644 --- a/lib/ansible/executor/connection_info.py +++ b/lib/ansible/executor/connection_info.py @@ -109,7 +109,8 @@ class ConnectionInformation: self.become_method = play.become_method if play.become_user: self.become_user = play.become_user - self.become_pass = play.become_pass + if play.become_pass: + self.become_pass = play.become_pass # non connection related self.no_log = play.no_log @@ -132,7 +133,6 @@ class ConnectionInformation: self.become = options.become self.become_method = options.become_method self.become_user = options.become_user - self.become_pass = '' # general flags (should we move out?) if options.verbosity: From 45b4ee9cfe2e2d0786422f9f7402beca631b0c78 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 5 Jun 2015 14:10:00 -0500 Subject: [PATCH 2/2] Don't allow setting become_pass in a play --- lib/ansible/executor/connection_info.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/ansible/executor/connection_info.py b/lib/ansible/executor/connection_info.py index 03d9039c49..d8881f54ab 100644 --- a/lib/ansible/executor/connection_info.py +++ b/lib/ansible/executor/connection_info.py @@ -109,8 +109,6 @@ class ConnectionInformation: self.become_method = play.become_method if play.become_user: self.become_user = play.become_user - if play.become_pass: - self.become_pass = play.become_pass # non connection related self.no_log = play.no_log