From 7648619a3f61fa9d9c27893daa7ee58fe479f4f5 Mon Sep 17 00:00:00 2001 From: nick6655 Date: Tue, 30 Jul 2019 08:15:48 -0700 Subject: [PATCH] pbrun: Use default value for become_user (#59754) * Update pbrun.py Require ternary operator for if get_option('user') returns NoneType object. * Update pbrun.py Added default value to become_user in documentation. * Update pbrun.py Changed default for become_user to be '' instead of root. (cherry picked from commit 1d560e5ce99e4f785c7fe215ac0440ee424af5d0) --- lib/ansible/plugins/become/pbrun.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/plugins/become/pbrun.py b/lib/ansible/plugins/become/pbrun.py index e232ccec343..a426c8c345a 100644 --- a/lib/ansible/plugins/become/pbrun.py +++ b/lib/ansible/plugins/become/pbrun.py @@ -14,6 +14,7 @@ DOCUMENTATION = """ options: become_user: description: User you 'become' to execute the task + default: '' ini: - section: privilege_escalation key: become_user @@ -95,7 +96,7 @@ class BecomeModule(BecomeBase): become_exe = self.get_option('become_exe') or self.name flags = self.get_option('become_flags') or '' - user = self.get_option('become_user') + user = self.get_option('become_user') or '' if user: user = '-u %s' % (user) noexe = not self.get_option('wrap_exe')