1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

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

This commit is contained in:
matsu-chara 2016-07-02 21:16:33 +09:00
parent 4e369a31db
commit 9f8b0cabcd
3 changed files with 3 additions and 3 deletions

View file

@ -188,7 +188,7 @@ class Role(Base, Become, Conditional, Taggable):
if self._default_vars is None: if self._default_vars is None:
self._default_vars = dict() self._default_vars = dict()
elif not isinstance(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): def _load_role_yaml(self, subdir):
file_path = os.path.join(self._role_path, subdir) file_path = os.path.join(self._role_path, subdir)

View file

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

View file

@ -8,7 +8,7 @@
replaced_hash: replaced_hash:
extra_args: "this is an extra arg" extra_args: "this is an extra arg"
merged_hash: 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" extra_args: "this is an extra arg"
group_vars_all: "this is in group_vars/all" group_vars_all: "this is in group_vars/all"
host_vars_testhost: "this is in host_vars/testhost" host_vars_testhost: "this is in host_vars/testhost"