ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 15:11:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix non-sudo execution, add --sudo-user to ansible-playbook.

Browse source
This commit is contained in:
John Kleint 2012-05-07 11:37:50 -04:00 • committed by Michael DeHaan
commit 710d085def
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bin/ansible
View file

@ -52,8 +52,6 @@ class Cli(object):
parser.add_option('-m', '--module-name', dest='module_name',
help="module name to execute (default=%s)" % C.DEFAULT_MODULE_NAME,
default=C.DEFAULT_MODULE_NAME)
parser.add_option('-U','--sudo-user', dest='sudo_user', help='desired sudo user (default=root)',
default=C.DEFAULT_SUDO_USER)
options, args = parser.parse_args()
self.callbacks.options = options
@ -72,19 +70,19 @@ class Cli(object):
inventory_manager = inventory.Inventory(options.inventory)
hosts = inventory_manager.list_hosts(pattern)
if len(hosts) == 0:
print >>sys.stderr, "No hosts matched"
sys.exit(1)
print >>sys.stderr, "No hosts matched"
sys.exit(1)
sshpass = None
sudopass = None
sudouser = options.sudo_user
if options.ask_pass:
sshpass = getpass.getpass(prompt="SSH password: ")
if options.ask_sudo_pass:
sudopass = getpass.getpass(prompt="sudo password: ")
options.sudo = True
if options.sudo_user:
options.sudo=True
options.sudo = True
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
if options.tree:
utils.prepare_writeable_dir(options.tree)

5
bin/ansible-playbook
View file

@ -50,6 +50,10 @@ def main(args):
sshpass = getpass.getpass(prompt="SSH password: ")
if options.ask_sudo_pass:
sudopass = getpass.getpass(prompt="sudo password: ")
options.sudo = True
if options.sudo_user:
options.sudo = True
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
override_hosts = None
if options.override_hosts:
override_hosts = options.override_hosts.split(",")
@ -77,6 +81,7 @@ def main(args):
timeout=options.timeout,
transport=options.connection,
sudo=options.sudo,
sudo_user=options.sudo_user,
sudo_pass=sudopass,
extra_vars=extra_vars
)