Merge pull request #16555 from matsu-chara/fix-error-msg-default-to-defaults

fix default/main.yml to defaults/main.yml

lib/ansible/playbook/role/__init__.py

@@ -188,7 +188,7 @@ class Role(Base, Become, Conditional, Taggable):
         if self._default_vars is None:
             self._default_vars = dict()
         elif not isinstance(self._default_vars, dict):
-            raise AnsibleParserError("The default/main.yml file for role '%s' must contain a dictionary of variables" % self._role_name)
+            raise AnsibleParserError("The defaults/main.yml file for role '%s' must contain a dictionary of variables" % self._role_name)
 
     def _load_role_yaml(self, subdir):
         file_path = os.path.join(self._role_path, subdir)

test/integration/roles/test_hash_behavior/defaults/main.yml

@@ -18,4 +18,4 @@
 
 ---
 test_hash:
-  default_vars: "this is in role default/main.yml"
+  default_vars: "this is in role defaults/main.yml"

test/integration/test_hash.yml

@@ -8,7 +8,7 @@
     replaced_hash:
       extra_args: "this is an extra arg"
     merged_hash:
-      default_vars: "this is in role default/main.yml"
+      default_vars: "this is in role defaults/main.yml"
       extra_args: "this is an extra arg"
       group_vars_all: "this is in group_vars/all"
       host_vars_testhost: "this is in host_vars/testhost"