Merge pull request #3932 from jocelynj/devel

Add option remote_user to task level, to specify the ssh login user
This commit is contained in:
jctanner 2013-10-15 06:34:57 -07:00
commit 69fa5954fd
2 changed files with 5 additions and 3 deletions

View file

@ -28,7 +28,7 @@ class Task(object):
'notify', 'module_name', 'module_args', 'module_vars', 'default_vars',
'play', 'notified_by', 'tags', 'register', 'role_name',
'delegate_to', 'first_available_file', 'ignore_errors',
'local_action', 'transport', 'sudo', 'sudo_user', 'sudo_pass',
'local_action', 'transport', 'sudo', 'remote_user', 'sudo_user', 'sudo_pass',
'items_lookup_plugin', 'items_lookup_terms', 'environment', 'args',
'any_errors_fatal', 'changed_when', 'failed_when', 'always_run', 'delay', 'retries', 'until'
]
@ -37,7 +37,7 @@ class Task(object):
VALID_KEYS = [
'name', 'meta', 'action', 'only_if', 'async', 'poll', 'notify',
'first_available_file', 'include', 'tags', 'register', 'ignore_errors',
'delegate_to', 'local_action', 'transport', 'sudo', 'sudo_user',
'delegate_to', 'local_action', 'transport', 'remote_user', 'sudo', 'sudo_user',
'sudo_pass', 'when', 'connection', 'environment', 'args',
'any_errors_fatal', 'changed_when', 'failed_when', 'always_run', 'delay', 'retries', 'until'
]
@ -135,6 +135,8 @@ class Task(object):
# can be hashes and lists, not just scalars
self.args = ds.get('args', {})
self.remote_user = ds.get('remote_user', play.playbook.remote_user)
if self.sudo:
self.sudo_user = ds.get('sudo_user', play.sudo_user)
self.sudo_pass = ds.get('sudo_pass', play.playbook.sudo_pass)