Fixing role variable precedence for top-level roles

Fixes #4026 Fixes #3989
11 years ago · 75a9357e5e
parent 294451d002
commit 75a9357e5e
1 changed files with 1 additions and 1 deletions
--- 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):