diff options
| author | Matt Davis <nitzmahone@users.noreply.github.com> | 2016-07-07 11:14:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 11:14:54 -0700 |
| commit | 30c63a41e98bbdaaa62ee5dd248fb5c2a1801889 (patch) | |
| tree | 9406a6c6100ebea8157819c890508fa3fc0825e2 | |
| parent | b6d41d3d4b376e2213959984be7c7d09add1b860 (diff) | |
| parent | 9f8b0cabcdb77aa56c5d0550034870e12cf84c47 (diff) | |
| download | ansible-30c63a41e98bbdaaa62ee5dd248fb5c2a1801889.tar.gz | |
Merge pull request #16555 from matsu-chara/fix-error-msg-default-to-defaults
fix default/main.yml to defaults/main.yml
| -rw-r--r-- | lib/ansible/playbook/role/__init__.py | 2 | ||||
| -rw-r--r-- | test/integration/roles/test_hash_behavior/defaults/main.yml | 2 | ||||
| -rw-r--r-- | test/integration/test_hash.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/playbook/role/__init__.py b/lib/ansible/playbook/role/__init__.py index 3f1908c754..b1eb45f2e7 100644 --- a/lib/ansible/playbook/role/__init__.py +++ b/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) diff --git a/test/integration/roles/test_hash_behavior/defaults/main.yml b/test/integration/roles/test_hash_behavior/defaults/main.yml index 6d10238a69..10cc09f31c 100644 --- a/test/integration/roles/test_hash_behavior/defaults/main.yml +++ b/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" diff --git a/test/integration/test_hash.yml b/test/integration/test_hash.yml index 36cd82d6bb..271563355b 100644 --- a/test/integration/test_hash.yml +++ b/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" |