cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
fix default/main.yml to defaults/main.yml
This commit is contained in:
Matt Davis 2016-07-07 11:14:54 -07:00 committed by GitHub
commit 30c63a41e9
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/role/__init__.py
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)

2
test/integration/roles/test_hash_behavior/defaults/main.yml
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"

2
test/integration/test_hash.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"