From d71834d1d2ae92edc4f9975ddcc8d1e72127d737 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 14 Apr 2015 10:56:10 -0500 Subject: [PATCH] Moving setting of options values to after play again Moving this above the play setting means that any default values set in play (like connection) override any corresponding CLI option, which is wrong. Generally CLI options should override things set in playbooks --- v2/ansible/executor/connection_info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/ansible/executor/connection_info.py b/v2/ansible/executor/connection_info.py index 19c8b130c7..ace2252e3a 100644 --- a/v2/ansible/executor/connection_info.py +++ b/v2/ansible/executor/connection_info.py @@ -64,14 +64,14 @@ class ConnectionInformation: self.no_log = False self.check_mode = False + if play: + self.set_play(play) + #TODO: just pull options setup to above? # set options before play to allow play to override them if options: self.set_options(options) - if play: - self.set_play(play) - def __repr__(self): value = "CONNECTION INFO:\n"