cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
14526 commits 47 branches 390 tags 440 MiB
Commit graph

254 commits

Author SHA1 Message Date
James Cammarata
30c1a2d861 Have group/host var file loading check for YAML extensions too 
Fixes #11132
 2015-06-16 11:55:56 -04:00
Toshio Kuratomi
f9b56a5d7c Fix raising AnsibleError 2015-06-05 11:41:23 -07:00
Toshio Kuratomi
96836412aa Make error messages tell which inventory script the error came from 2015-06-03 11:51:33 -07:00
Toshio Kuratomi
1c8527044b Fix error handling when pasing output from dynamic inventory 2015-06-03 11:29:20 -07:00
James Cammarata
620fad9f8d Fixing an oops in inventory/__init__.py where the slots are incorrect 2015-06-01 20:02:15 -05:00
James Cammarata
fe41f109a9 Merge branch 'v2_final' into devel_switch_v2 2015-06-01 16:42:59 -05:00
James Cammarata
4bc7703db3 Fixing some small bugs related to integration tests (v2) 2015-06-01 16:42:10 -05:00
James Cammarata
2bad888f28 Merge branch 'v2_final' into devel_switch_v2 
Conflicts:
	lib/ansible/inventory/__init__.py
	lib/ansible/modules/core
	lib/ansible/utils/__init__.py
	lib/ansible/utils/module_docs.py
 2015-05-28 15:26:03 -05:00
Brian Coca
0913b8263c made special treatment of certain filesystem for selinux configurable 2015-05-15 13:52:27 -04:00
Brian Coca
e2de336a23 made special treatment of certain filesystem for selinux configurable 2015-05-15 13:19:15 -04:00
James Cammarata
ce3ef7f4c1 Making the switch to v2 2015-05-03 21:47:26 -05:00
Brian Coca
c3d34a5386 Merge pull request #8936 from srvg/inventoryscript_onlychildren 
Allow InventoryScript JSON with childgroups only
 2015-03-05 17:11:04 -05:00
Toshio Kuratomi
084fbbdea9 Reverse the conditional so there's one less return from this function 2015-02-26 22:50:11 -08:00
Alvaro Lopez Ortega
2e929cf0ce Fixes bug #10281 - Trailing zeros were truncated from strings 2015-02-21 19:54:38 +01:00
Alvaro Lopez Ortega
a14248ffe1 Fixes bug #10281 - Trailing zeros were truncated from strings 2015-02-21 16:40:50 +01:00
Brian Coca
751701c6f2 Merge pull request #9672 from quinot/topic/lineno-in-inventory-err 
Report location (filename and line number) for inventory syntax errors
 2015-01-29 12:36:30 -05:00
Toshio Kuratomi
a63e4c595f Another place that needs to be json_dict_bytes_to_unicode 2015-01-26 22:04:51 -08:00
Toshio Kuratomi
0f6b87d33e Revert "Fix import statements" -- those impotrt statements were right 
before... something else is fishy

This reverts commit 8ab536fbf2.
 2015-01-26 22:01:52 -08:00
Toshio Kuratomi
8ab536fbf2 Fix import statements 2015-01-26 21:49:09 -08:00
Toshio Kuratomi
915d232d5f jinja2 cannot handle byte strs with non-ascii. So we need to transform potential byte str into unicode type. This fix is for dynamic inventory. 
Fixes #10007
 2015-01-26 20:39:09 -08:00
Brian Coca
2ef5d6be1e Merge pull request #9702 from bcoca/better_errors_on_delegate 
better exception handling with delegated hosts
 2015-01-19 15:25:01 -05:00
Brian Coca
6b3d0f4788 now captures returncode errors on inventory scripts 2015-01-15 13:38:25 -05:00
Brian Coca
61a30e5f49 better exception handling with delegated hosts 2014-12-03 07:26:42 -05:00
Thomas Quinot
23d959db71 Report location (filename and line number) for inventory syntax errors 
When AnsibleError is raised for a syntax error in an inventory file,
report filename and line number to help pinpointing the error.
 2014-11-30 10:41:09 +01:00
James Cammarata
d19fe8d95d Fetch vars for host directly when calculating the delegated user 
This fixes the case in which the delegated to host may not be in the
specified hosts list, in which cases facts/vars for the host were
not available in the injected hostvars.

This also fixes the inventory variable fetching function, so that an
unknown host raises a proper error as opposed to a NoneType exception.

Fixes #8224
 2014-10-10 01:18:18 -05:00
Toshio Kuratomi
a10d10f647 Workaround more python-2.6 shlex not being able to handle unicode strings 2014-10-08 14:30:36 -04:00
Toshio Kuratomi
cef2a8795f Make dynamic inventory return byte str, not unicode 2014-10-02 20:27:06 -04:00
Michael DeHaan
26cdddaebf Tracebacks are now catchable with ignore_errors and have streamlined output. Also removes 'baby-JSON' for bash modules. 2014-09-11 12:27:21 -04:00
Serge van Ginderachter
69740b86e8 Allow InventoryScript JSON with childgroups only 
and without hosts and vars

Without this patch, the simplified syntax is triggered when a group
is defined like this:

    "platforms": {
        "children": [
            "cloudstack"
        ]
    }

Which results in a group 'platforms' with 1 host 'platforms'.

	modified:   lib/ansible/inventory/script.py
 2014-09-09 11:37:54 +02:00
Serge van Ginderachter
3a228b9d55 InventoryScript: better syntax checking for json stream 2014-08-21 18:06:07 +02:00
Serge van Ginderachter
a1f09bd89f Merge variables for hosts instead of updating in get_variables() 2014-08-20 01:54:46 -05:00
Serge van Ginderachter
0ab721d51e better logic for all-group variables for implicit localhost 2014-08-19 16:41:51 +02:00
Serge van Ginderachter
a2cfe8770b Inventory: fix logic mistake in loading/retrieving variables for groups 2014-08-19 16:34:26 +02:00
James Cammarata
e3895840d1 Make sure group_vars/all is loaded for ungrouped hosts 
Fixes #6563
 2014-08-18 12:29:46 -05:00
James Cammarata
b4476c238f Use match() instead of search() for pattern matching 
Also related to f48fa3, fix for #8614
 2014-08-14 12:26:52 -05:00
James Cammarata
f48fa3759a Fix host pattern matching and enhance error detection 
Fixes #8614
 2014-08-14 12:13:40 -05:00
James Cammarata
bea0845322 Fix vault_password positional args error 2014-08-14 10:28:08 -05:00
Michael DeHaan
8c4161d4a1 Merge branch 'retf_py' of git://github.com/berendt/ansible into devel 
Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py
 2014-08-08 12:17:37 -04:00
Serge van Ginderachter
7c96f1d803 InventoryDir: fixing yet another corner case 2014-08-08 08:54:11 +02:00
Serge van Ginderachter
e8b45a9ef7 Invalidate host/group variables cache when loading 
extra varsiables based on playbook basedir.
 2014-07-14 15:21:33 +02:00
Serge van Ginderachter
d39ff55688 Fix logic bug when loading vars for a new playbook basedir. 2014-07-14 15:12:53 +02:00
James Cammarata
4e5eb7559e Merge branch 'svg_and_inventory_refactor' into devel 2014-07-10 14:43:07 -05:00
Dan Slimmon
307a3e8a9c Fixed regex square-bracket bug. 
Regexes were being parsed like ordinary ansible host patterns, so
square-bracket groups were getting interpolated wrongly.
 2014-07-10 00:08:12 +00:00
James Cammarata
aa261bdd14 Optimizing groups_for_host() lookup in inventory 2014-07-07 21:08:39 -05:00
James Cammarata
fe892fccb1 Merge remote-tracking branch 'svg/varsplugins_refactor' into svg_and_inventory_refactor 2014-07-07 14:16:37 -05:00
James Cammarata
11a5fc85f4 Merge branch 'inventory_refactoring' into svg_and_inventory_refactor 2014-07-07 13:11:58 -05:00
James Cammarata
bcf83cbc24 Merge branch 'sergevanginderachter-inventorytree' into svg_and_inventory_refactor 2014-07-07 13:11:52 -05:00
Serge van Ginderachter
ff4119adc0 Performance optimization in resolving host patterns 
Avoid resolving a pattern that is a plain host. When matching a hostname in the
hosts_cache, just use the host object from there.

When running a task on say 750 hosts, this yields a huge improvement.
 2014-07-07 12:50:50 -05:00
James Cammarata
ff04b2b532 Allow empty yaml vars files 
Fixes #7843
 2014-07-04 23:10:32 -05:00
Michael DeHaan
c2ac8fda1e Data from inventory scripts should be able to use nested Jinja2 expressions. 2014-07-03 16:11:14 -04:00