Commit 4f139673 by James Tanner

Fixes #4536 Get the remote_user from multiple sources in a preferred order

parent c876ce4b
...@@ -135,7 +135,13 @@ class Task(object): ...@@ -135,7 +135,13 @@ class Task(object):
# can be hashes and lists, not just scalars # can be hashes and lists, not just scalars
self.args = ds.get('args', {}) self.args = ds.get('args', {})
self.remote_user = ds.get('remote_user', play.playbook.remote_user) # get remote_user for task, then play, then playbook
if ds.get('remote_user') is not None:
self.remote_user = ds.get('remote_user')
elif ds.get('remote_user', play.remote_user) is not None:
self.remote_user = ds.get('remote_user', play.remote_user)
else:
self.remote_user = ds.get('remote_user', play.playbook.remote_user)
if self.sudo: if self.sudo:
self.sudo_user = ds.get('sudo_user', play.sudo_user) self.sudo_user = ds.get('sudo_user', play.sudo_user)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment