9 Commits (267b29cec743b74d83b8f2c56f6ac6ed8a186079)

Author	SHA1	Message	Date
Serge van Ginderachter	a6b827ca07	don't parse subdirs in host/group_vars ... as those are not supported in core vars_plugins/group_vars.py but might be used by other vars_plugins	2013-05-13 11:04:49 +02:00
Michael DeHaan	50586928b2	No need for trailing semicolon.	2013-05-11 17:25:05 -04:00
Michael DeHaan	7c6341718e	Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp ... Conflicts: lib/ansible/inventory/vars_plugins/group_vars.py lib/ansible/runner/__init__.py lib/ansible/utils/__init__.py test/TestPlayBook.py	2013-04-16 20:06:06 -04:00
C. Morgan Hamill	863cb50530	Allow '.yml'/'.yaml' extension on group_vars files. ... Look for a file with the base name of the group/host, first without a file extension, then with a '.yml' extension, and, finally, with a '.yaml' extension, loading vars from only the first one found.	2013-04-16 19:59:23 -04:00
George Miroshnykov	6826aa7360	Tweaked merge_hash to also affect Runner behavior	2013-04-06 13:06:38 +03:00
Stoned Elipot	86995d7786	Fix pathnames in comments	2013-03-22 02:11:58 +01:00
Michel Blanc	e28e538c6e	Adds user-selectable hash merging support in vars ... Hash variables are currently overriden if they are redefined. This doesn't let the user refine hash entries or overriding selected keys, which can, for some, be a desirable feature. This patch let the user force hash merging by setting the hash_behaviour value to "merge" (without the quotes) in ansible.cfg However, by default, ansible behaves like it always did and if any value besides "merge" is used ("replace" is suggested in the example ansible.cfg file), it will also behave as always.	2013-01-23 21:39:34 +01:00
Dag Wieers	3728b2f459	Missing errors-import causes traceback	2012-10-29 15:16:26 +01:00
Michael DeHaan	6ba30170dd	Make group_vars and host_vars available to usr/bin/ansible, and make vars_plugins exist	2012-10-26 19:55:59 -04:00