diff options
| author | James Cammarata <jimi@sngx.net> | 2013-09-09 15:14:03 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2013-09-09 15:14:03 -0500 |
| commit | 75a9357e5e97b11b8cc3048afe8c0fcf30e4d606 (patch) | |
| tree | 212a1d44a6e101f08485caef849e6197cc5f4a47 | |
| parent | 294451d00243b7caf3c0aaae8476ec2a96149bdb (diff) | |
| download | ansible-75a9357e5e97b11b8cc3048afe8c0fcf30e4d606.tar.gz | |
Fixing role variable precedence for top-level roles
Fixes #4026
Fixes #3989
| -rw-r--r-- | lib/ansible/playbook/play.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 4ebc1b6cb0..c11e8f05bd 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -164,7 +164,7 @@ class Play(object): raise errors.AnsibleError("too many levels of recursion while resolving role dependencies") for role in roles: role_path,role_vars = self._get_role_path(role) - role_vars = utils.combine_vars(role_vars, passed_vars) + role_vars = utils.combine_vars(passed_vars, role_vars) vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'vars'))) vars_data = {} if os.path.isfile(vars): |