Correct variable blending from vars_files with hostvars in them

Fixes #8638

test/integration/roles/test_var_precedence/tasks/main.yml

@@ -3,3 +3,4 @@
       - 'extra_var == "extra_var"'
       - 'vars_var == "vars_var"'
       - 'vars_files_var == "vars_files_var"'
+      - 'vars_files_var_role == "vars_files_var_role3"'

test/integration/roles/test_var_precedence_role1/tasks/main.yml

@@ -2,6 +2,7 @@
 - debug: var=param_var
 - debug: var=vars_var
 - debug: var=vars_files_var
+- debug: var=vars_files_var_role
 - debug: var=defaults_file_var_role1
 - assert:
     that:
@@ -9,4 +10,5 @@
       - 'param_var == "param_var_role1"'
       - 'vars_var == "vars_var"'
       - 'vars_files_var == "vars_files_var"'
+      - 'vars_files_var_role == "vars_files_var_role3"'
       - 'defaults_file_var_role1 == "defaults_file_var_role1"'

test/integration/roles/test_var_precedence_role1/vars/main.yml

@@ -1,3 +1,4 @@
 ---
 # should override the global vars_files_var since it's local to the role
-vars_files_var: "vars_files_var_role1"
+# but will be set to the value in the last role included which defines it
+vars_files_var_role: "vars_files_var_role1"

test/integration/roles/test_var_precedence_role2/tasks/main.yml

@@ -2,6 +2,7 @@
 - debug: var=param_var
 - debug: var=vars_var
 - debug: var=vars_files_var
+- debug: var=vars_files_var_role
 - debug: var=defaults_file_var_role1
 - assert:
     that:
@@ -9,4 +10,5 @@
       - 'param_var == "param_var_role2"'
       - 'vars_var == "vars_var"'
       - 'vars_files_var == "vars_files_var"'
+      - 'vars_files_var_role == "vars_files_var_role3"'
       - 'defaults_file_var_role2 == "overridden by role vars"'

test/integration/roles/test_var_precedence_role2/vars/main.yml

@@ -1,5 +1,5 @@
 ---
 # should override the global vars_files_var since it's local to the role
-vars_files_var: "vars_files_var_role1"
+vars_files_var_role: "vars_files_var_role2"
 # should override the value in defaults/main.yml for role 2
 defaults_file_var_role2: "overridden by role vars"

test/integration/roles/test_var_precedence_role3/tasks/main.yml

@@ -2,6 +2,7 @@
 - debug: var=param_var
 - debug: var=vars_var
 - debug: var=vars_files_var
+- debug: var=vars_files_var_role
 - debug: var=defaults_file_var_role1
 - assert:
     that:
@@ -9,4 +10,5 @@
       - 'param_var == "param_var_role3"'
       - 'vars_var == "vars_var"'
       - 'vars_files_var == "vars_files_var"'
+      - 'vars_files_var_role == "vars_files_var_role3"'
       - 'defaults_file_var_role3 == "overridden from inventory"'

test/integration/roles/test_var_precedence_role3/vars/main.yml

@@ -1,3 +1,3 @@
 ---
 # should override the global vars_files_var since it's local to the role
-vars_files_var: "vars_files_var_role1"
+vars_files_var_role: "vars_files_var_role3"

test/integration/test_var_precedence.yml

@@ -12,8 +12,10 @@
   - debug: var=extra_var
   - debug: var=vars_var
   - debug: var=vars_files_var
+  - debug: var=vars_files_var_role
   - assert:
       that:
         - 'extra_var == "extra_var"'
         - 'vars_var == "vars_var"'
         - 'vars_files_var == "vars_files_var"'
+        - 'vars_files_var_role == "vars_files_var_role3"'

test/integration/vars/test_var_precedence.yml

@@ -2,3 +2,4 @@
 extra_var: "BAD!"
 role_var: "BAD!"
 vars_files_var: "vars_files_var"
+vars_files_var_role: "should be overridden by roles"