Include parent role vars as well as _role_vars (#75034)

lib/ansible/playbook/role/__init__.py

@@ -456,6 +456,7 @@ class Role(Base, Conditional, Taggable, CollectionSearch):
 
         if dep_chain:
             for parent in dep_chain:
+                inherited_vars = combine_vars(inherited_vars, parent.vars)
                 inherited_vars = combine_vars(inherited_vars, parent._role_vars)
         return inherited_vars
 

test/integration/targets/roles_var_inheritance/aliases

@@ -0,0 +1 @@
+shippable/posix/group5

test/integration/targets/roles_var_inheritance/play.yml

@@ -0,0 +1,4 @@
+- hosts: localhost
+  roles:
+    - A
+    - B

test/integration/targets/roles_var_inheritance/roles/A/meta/main.yml

@@ -0,0 +1,4 @@
+dependencies:
+  - role: common_dep
+    vars:
+      test_var: A

test/integration/targets/roles_var_inheritance/roles/B/meta/main.yml

@@ -0,0 +1,4 @@
+dependencies:
+  - role: common_dep
+    vars:
+      test_var: B

test/integration/targets/roles_var_inheritance/roles/child_nested_dep/vars/main.yml

@@ -0,0 +1 @@
+var_precedence: dependency

test/integration/targets/roles_var_inheritance/roles/common_dep/meta/main.yml

@@ -0,0 +1,4 @@
+dependencies:
+  - role: nested_dep
+    vars:
+      nested_var: "{{ test_var }}"

test/integration/targets/roles_var_inheritance/roles/common_dep/vars/main.yml

@@ -0,0 +1 @@
+var_precedence: parent

test/integration/targets/roles_var_inheritance/roles/nested_dep/meta/main.yml

@@ -0,0 +1,3 @@
+allow_duplicates: yes
+dependencies:
+  - child_nested_dep

test/integration/targets/roles_var_inheritance/roles/nested_dep/tasks/main.yml

@@ -0,0 +1,5 @@
+- debug:
+    var: nested_var
+
+- debug:
+    var: var_precedence

test/integration/targets/roles_var_inheritance/runme.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eux
+
+ansible-playbook -i ../../inventory play.yml "$@" | tee out.txt
+
+test "$(grep out.txt -ce '"nested_var": "A"')" == 1
+test "$(grep out.txt -ce '"nested_var": "B"')" == 1
+test "$(grep out.txt -ce '"var_precedence": "dependency"')" == 2