diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-03-31 13:53:53 +0200 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-03-31 13:53:53 +0200 |
| commit | ba7d0b8cec2235f94c1b96b6c041d00c1b942bac (patch) | |
| tree | dded2c1711717dc18f211a1ed67c9560bbe66366 | |
| parent | pyflakes: Unused import / unused var (diff) | |
| parent | Correct default user and port in playbook. (diff) | |
| download | ansible-ba7d0b8cec2235f94c1b96b6c041d00c1b942bac.tar.xz ansible-ba7d0b8cec2235f94c1b96b6c041d00c1b942bac.zip | |
Merge pull request #96 from jhoekx/playbook-defaults
Correct default user and port in playbook.
| -rwxr-xr-x | lib/ansible/playbook.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/playbook.py b/lib/ansible/playbook.py index 4881243f15..4dd5906498 100755 --- a/lib/ansible/playbook.py +++ b/lib/ansible/playbook.py @@ -472,8 +472,8 @@ class PlayBook(object): vars_files = pg.get('vars_files', {}) tasks = pg.get('tasks', []) handlers = pg.get('handlers', []) - user = pg.get('user', C.DEFAULT_REMOTE_USER) - port = pg.get('port', C.DEFAULT_REMOTE_PORT) + user = pg.get('user', self.remote_user) + port = pg.get('port', self.remote_port) sudo = pg.get('sudo', False) self.callbacks.on_play_start(pattern) |