62979efa14
Finish up plugin porting to global display
...
Also remove display = display which does nothing
2015-11-11 10:44:23 -08:00
566144461f
Remove internal use of display and use the top-level import
2015-11-10 12:02:29 -05:00
09994c18f3
Correct logic around determining environment variable existence
...
Fixes #13105
2015-11-09 21:04:24 -05:00
ccbcfcddfc
Move where we add environment and make it conditional on not existing
...
Also displays a warning now, because users should not be using that variable
name as it causes a collision with the internal variable of the same name.
2015-11-09 16:28:54 -05:00
937584cd52
Ensure 'environment' is set in the magic variables
...
Fixes #13033
2015-11-09 14:50:39 -05:00
7e04947599
Be more selective about what variables we cache during templating
...
Fixes #13087
2015-11-09 14:07:48 -05:00
dd4ca66e1e
Make sure hostvars cache is recreated during serialization
2015-11-06 22:21:50 -05:00
5040abaaf2
Merge branch 'devel_cache_for_do_template_call' of https://github.com/Yannig/ansible into Yannig-devel_cache_for_do_template_call
2015-11-06 22:04:52 -05:00
63c47fb271
Fixing up performance
2015-11-05 16:22:37 -05:00
483c25a609
Revert "switched host patterns to use sets, simplified logic which now uses buitins"
...
need this to be lists, for order and other considerations
This reverts commit 8e2f0b3f2c
2015-11-05 15:41:17 -05:00
8e2f0b3f2c
switched host patterns to use sets, simplified logic which now uses buitins
2015-11-05 15:02:06 -05:00
ccbdd6229a
Use static vars when computing host vars known to be static (inventory_hostname, inventory_dir etc.).
2015-11-04 22:16:14 +01:00
30f827d92d
Fix python3 test.
2015-11-03 11:52:09 +01:00
4a8d1703d4
New patch against hostvars.py. With this patch, Ansible run lose 50% of time.
...
Little rewrite of previous patch to use sha1 signature.
Use fail_on_undefined to compute sha1 signature.
2015-11-02 21:04:20 +01:00
4203850d1a
Break apart a looped dependency to show a warning when parsing playbooks
...
Display a warning when a dict key is overwritten by pyyaml
Fixes #12888
2015-10-27 12:39:42 -07:00
cace91df56
Allow hostvars cache to be invalidated so hostvars contain all hosts after add_host
...
Fixes #12925
2015-10-27 14:12:17 -04:00
7ebfe72015
added missing string_types
2015-10-24 15:49:30 -04:00
8ce864db6f
sanatize results
2015-10-24 15:23:12 -04:00
498c27d09a
Re-adding role_names magic variable
...
Fixes #12863
2015-10-22 11:06:47 -04:00
08c9e70307
made display part of variable manager and corrected reference to it
...
fixes #12859
2015-10-21 22:29:27 -04:00
99e7bb35c1
Simplify UnsafeProxy as we don't need to use it for byte strings, only text
2015-10-20 10:57:23 -07:00
f34b55ac2b
Add python3-compat boilerplate to all .py files in lib/ansible
2015-10-19 18:36:19 -07:00
0bbe9d5bd0
Make hostvars json/yaml serializable in filters
...
Fixes #12615
2015-10-18 10:09:05 -04:00
baa309309d
Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version.
2015-10-16 08:21:28 -07:00
aee6de5a76
group_names should not include implied 'all', fixes #12763
2015-10-15 11:46:43 -04:00
e511d6d458
Make UnsafeProxy work on Python 3
...
Instead of str and unicode we have to deal with bytes and str.
2015-10-13 09:41:08 +03:00
af6a316d9b
Remove unused import
...
Fixes ImportError: No module named '__builtin__' on Python 3.
2015-10-13 09:37:48 +03:00
cd2cb178ae
Totally rework the way UnsafeProxy does things
2015-10-12 18:13:09 -04:00
d15fcf05f0
Fix bug in the way temp vars were created for templating vars_files
...
Fixes #12711
2015-10-12 12:17:45 -04:00
1f82971283
Adding the inventory_file var back
2015-10-10 21:54:28 -04:00
7da478a4f4
Fix an issue where cache plugins weren't updated
...
The first call to persisting facts would work due to the assignment of a
MutableMapping calling __setitem__ but subsequent module fact data would
not be propogated to the fact cache plugins because update() doesn't
invoke __setitem__. This changes the behavior a little bit and ensures
set() is called on cache plugins.
2015-10-09 11:16:41 -04:00
d91b3c6b9d
Make sure magic variables are available when templating vars_files
...
Also does some reorganization/cleanup on the magic vars/delegated
variable generation portions of VariableManager to make the above
possible.
Fixes #12633
2015-10-05 16:32:58 -04:00
3bd71d0619
Use delegated_to field for play context remote_addr, if none other exists
...
Fixes #12527
2015-09-30 09:27:29 -04:00
bb1101498d
Clean up typo from cdc6c52
2015-09-25 16:58:27 -04:00
cdc6c5208e
Clean string data run through the template engine
...
Also strip UnsafeProxy off of low level srings and objects to ensure
they don't cause issues later down the road
Fixes #12513
2015-09-25 16:49:31 -04:00
ccddda1ebc
Merge pull request #12502 from mgedmin/py3k
...
Python 3: make test_variable_manager_precedence pass
2015-09-25 03:05:02 -04:00
31d5f88a1d
Use the task loop to calculate multiple delegated hosts
...
Due to the way we're now calculating delegate_to, if that value is based
on a loop variable ('item') we need to calculate all of the possible
delegated_to variables for that loop.
Fixes #12499
2015-09-25 01:41:09 -04:00
95b371dd60
Use AnsibleFileNotFound instead of AnsibleParsingError when YAML files are not found
...
And update portions of code to expect the proper error.
Fixes #12512
2015-09-24 16:27:25 -04:00
12df9f2e31
Make hostvars more dynamic again to improve performance with large inventories
...
Fixes #12477
2015-09-24 13:53:44 -04:00
6d4618f46f
Python 3: there's no dict.iteritems()
2015-09-24 12:50:00 +03:00
1164e83477
Remove unnecessary calls to save inventory restrictions since 81bf88b
2015-09-23 12:18:09 -04:00
95c6fe88e4
Fix handling of conditional vars_files which contain variables
...
Fixes #12484
2015-09-23 01:26:24 -04:00
1076155d8d
When failing because of vars_files templating, try and bubble up the file/line info
2015-09-22 12:13:55 -04:00
0fb4a6a67b
Tweak to the way new host variables are created for delegated hosts
2015-09-22 03:03:21 -04:00
18adfc6d1a
Set some default vars on hosts created for delegate_to connections
2015-09-22 02:35:01 -04:00
a22f7b883d
Restrict role param vars to tasks within that role
...
Fixes #12460
2015-09-22 02:14:18 -04:00
cb7060c9fe
Allow undefined var errors to bubble up when templating vars_files in certain conditions
...
Follow up to 8769f03c
2015-09-21 11:57:37 -04:00
8769f03c16
Also catch AnsibleUndefinedVariable errors when templating vars_files names
...
Fixes #12449
2015-09-21 09:35:06 -04:00
1f5584aa5b
Refactoring delegate_to code
...
Now, instead of relying on hostvars on the executor side, we compile
the vars for the delegated to host in a special internal variable and
have the PlayContext object look for things there when applying task/
var overrides, which is much cleaner and takes advantage of the code
already dealing with all of the magic variable variations.
Fixes #12127
Fixes #12079
2015-09-18 15:25:10 -04:00
a1fffff92c
Merge branch 'addresses' of https://github.com/amenonsen/ansible into amenonsen-addresses
2015-09-17 13:43:05 -04:00
575a8b8c77
Merge Host.ipv[46]_address into .address
...
The earlier distinction was never used; .ipv6_address was always a copy
of .ipv4_address, and the latter was always used to set the remote_addr
field in the PlayContext.
Also uses the canonical ansible_host/ansible_port names when setting the
address and port from variables.
2015-09-17 23:03:48 +05:30
8acbc00853
Fixing groups variable structure to match v1
...
Fixes #12418
2015-09-17 10:24:03 -04:00
11c27078c0
Cleaning up inventory bugs from earlier group change
2015-09-16 16:36:27 -04:00
df89f03627
Fixing precedence order for new nonpersistent vars (set_fact/register)
...
These used to go in vars_cache, so merging them in after that as they
are "live" variables and the user would most likely want to see these
above anything else.
2015-09-11 12:24:44 -04:00
292e2da4e1
Fix some bugs related to facts/nonpersistent-facts cache split
...
Fixes #12313
2015-09-10 17:36:39 -04:00
95a58d1178
Properly serialize UnsafeProxy objects
...
Required as part of fix for #12123
2015-09-10 14:01:02 -04:00
950e067d2f
Merge pull request #12295 from napkindrawing/patch-3
...
Typo in comment: "bsaename" → "basename"
2015-09-09 21:41:13 -04:00
22639a2a22
Fix mistake in fact setting to nonpersistent cache in VariableManager
...
Fixes #12301
2015-09-09 18:28:39 -04:00
e81947c3b4
Fix vars_prompt short form support (and mark deprecated)
2015-09-09 17:52:44 -04:00
56d7f3889d
Add new level of vars to deal with set_fact/register precedence rules
2015-09-09 12:21:07 -04:00
172bbac97a
Typo in comment: "bsaename" → "basename"
2015-09-09 11:55:40 -04:00
30399edada
Use UnsafeProxy for lookup results too
...
Also fixes a couple of bugs that popped up when using the proxy class
2015-09-08 12:19:39 -04:00
bd405169fb
Fix #12258 : don't wrap None in UnsafeProxy.
2015-09-08 04:02:04 -04:00
ac6f61ec7f
Properly handle group/host_var files with dots in them
...
Fixes #12245
2015-09-08 03:20:09 -04:00
1eb5b42705
Don't double proxy unsafe variables
...
Potential fix for #12260
2015-09-08 02:50:07 -04:00
ff9f5d7dc8
Starting to add additional unit tests for VariableManager
...
Required some rewiring in inventory code to make sure we're using
the DataLoader class for some data file operations, which makes mocking
them much easier.
Also identified two corner cases not currently handled by the code, related
to inventory variable sources and which one "wins". Also noticed we weren't
properly merging variables from multiple group/host_var file locations
(inventory directory vs. playbook directory locations) so fixed as well.
2015-09-04 16:41:38 -04:00
87f75a50ad
Use proxy class to mark variables unsafe for templating
...
Fixes #12191
2015-09-04 16:38:06 -04:00
aeff960d02
Cleanup combine_vars
...
* Dedupe combine_vars() code (removed from VariableManager)
* Fix merge_hash algorithm to preserve the type
* unittest combine_vars and merge_hash
2015-09-01 11:23:12 -07:00
a341a8a093
Make sure tasks from a role see their defaults above all others
...
Fixes #12081
2015-09-01 11:27:35 -04:00
54dbfba8f8
Make combine_vars() compatible with Python 3
...
Fixes
TypeError: unsupported operand type(s) for +: 'dict_items' and 'dict_items'
on Python 3.
2015-09-01 09:39:59 +03:00
0c6ce31f76
Use 'except ... as' syntax
...
This syntax works on Python 2.6 through 3.x. lib/ansible/module_utils
(and lib/ansible/modules) need to support Python 2.4, so I didn't touch
those.
2015-08-27 22:15:04 +03:00
81bf88b6e0
fixed hostvars access in conjunction with --limit usage
2015-08-27 00:15:26 +03:00
af06a97f17
kept vars as alias to hostvars[inventory_hostname] and avoid subtrees into themselves
2015-08-23 17:51:47 -04:00
635fa0757b
Several var fixes
...
* Fixes hostvar serialization issue (#12005 )
* Fixes regression in include_vars from within a role (#9498 ), where
we had the precedence order for vars_cache (include_vars, set_fact)
incorrectly before role vars.
* Fixes another bug in which vars loaded from files in the format of
a list instead of dictionary would cause a failure.
Fixes #9498
Fixes #12005
2015-08-21 12:02:23 -04:00
36cbd771a4
changed fixme to deprecated
2015-08-19 15:49:37 -04:00
e7b2308b66
Performance improvements
...
* Speed up serialization of hostvars by simply using the internal
dictionary used for cached lookups
* Use blocking gets/puts on queues instead of spin locking
* Merge sequential implicitly created blocks
2015-08-17 13:46:57 -04:00
70d024ffce
show errors when missing vars file or when there is syntax issue in the file
...
fixes #11945
2015-08-12 22:39:06 -04:00
38eb53de1d
Fix bug in vars using correct temp value for vars
...
Fixes #11877
2015-08-11 21:23:37 -04:00
3939348286
Fix HostVars to support containment tests
2015-07-31 13:58:09 -07:00
4c733fe4b7
Fix issues with vars_prompt and vars_files
...
* Prompt had to be moved up, as it needed to be done before the first
templating of the play occurs, otherwise vars_files won't be templated
properly
* Fixed a bug related to an earlier fix of vars_files incorporating
extra vars to do the templating of the file name
Fixes #11404
2015-07-21 14:52:57 -04:00
7124504ccf
Incorporate extra vars when templating vars_files
...
Fixes #11377
2015-07-21 02:10:26 -04:00
291f07242c
Properly return Jinja2 Undefined class for bad hostvars lookups
...
Fixes #11176
2015-07-15 14:36:42 -04:00
9a586c3512
Properly catch AnsibleError and not all errors
2015-07-13 20:49:11 -04:00
e0632cb9a4
Merge pull request #11577 from srvg/yaml_file_extensions
...
Use YAML_FILENAME_EXTENSIONS for vars files.
2015-07-13 18:29:26 -04:00
d5fb11d89c
Use YAML_FILENAME_EXTENSIONS for vars files.
...
The v2 codebase didn't use this previously introduced constant yet.
C.YAML_FILENAME_EXTENSIONS
2015-07-14 00:23:35 +02:00
9c8f0da327
Do not combine group_vars with an empty file
...
This addresses a specific case with multiple vars files
in a group_vars/${groupname}/ directory where one of those files
is empty, which returns None instead of an empty dict.
2015-07-14 00:14:13 +02:00
c18fdd0c18
Re-implement "conditional imports" for vars_files
2015-07-13 15:18:23 -04:00
d977da5b41
Fixing up fact_cache use in VariableManager
2015-07-13 11:06:03 -04:00
cf2a66ef30
Add ansible_version magic variable
...
Fixes #11545
2015-07-10 03:22:37 -04:00
b520d5bc60
Lots of fixes for integration test bugs
2015-07-10 01:53:59 -04:00
f67949e42c
Readd logic for ansible_managed to template action plugin
...
Fixes #11317
2015-07-07 16:48:19 -04:00
38cc54b717
Make 'vars' a copy to prevent recursion issues
2015-07-04 23:34:07 -04:00
38c5da9d2a
Revert "Backing out vars magic variable due to failed tests"
...
This reverts commit 388e46a485
2015-07-04 22:48:20 -04:00
388e46a485
Backing out vars magic variable due to failed tests
2015-07-04 22:44:45 -04:00
76c5be3a31
Add 'vars' to magic variables
2015-07-04 21:28:28 -04:00
b6c52ce115
Allow role variables to be optionally kept in a private scope
2015-07-01 11:33:14 -04:00
f433e709f2
Fix templating of hostvars values
...
Also adds play information into the hostvars creation, to assure the
variable manager used there has access to vars and vars_files
Fixes #9501
Fixes #8213
Fixes #7844
2015-06-27 21:04:16 -04:00
0b16580567
Add in playbook_dir magic variable
2015-06-23 14:29:39 -04:00
7490044bbe
Implement play_hosts magic variable (and ansible_current_hosts)
...
Fixes #8073
2015-06-22 21:03:55 -04:00
0d5b7ae669
fixes 11296 where the groups does not have all the groups
2015-06-17 19:18:19 +05:30
30c1a2d861
Have group/host var file loading check for YAML extensions too
...
Fixes #11132
2015-06-16 11:55:56 -04:00
48d62fd934
Cleaning up VariableManager tests (v2)
2015-05-14 20:10:31 -05:00
fd321355d6
Adding 'role_path' to VariableManager "magic" variables (v2)
2015-05-11 14:04:17 -05:00
daf533c80e
V2 fixes
...
* PluginLoader class will now be more selective about loading some
plugin classes, if a required base class is specified (used to avoid
loading v1 plugins that have changed significantly in their apis)
* Added ability for the connection info class to read values from a
given hosts variables, to support "magic" variables
* Added some more magic variables to the VariableManager output
* Fixed a bug in the ActionBase class, where the module configuration
code was not correctly handling unicode
2015-05-11 11:29:48 -05:00
7f21f270d9
Be more lenient in instance check: MutableMapping is more general than dict
2015-05-08 13:18:19 -07:00
ce3ef7f4c1
Making the switch to v2
2015-05-03 21:47:26 -05:00
Toshio Kuratomi
James Cammarata
Brian Coca
Yannig Perre
Marius Gedminas
Ben Keith
Matthew Jones
Abhijit Menon-Sen
napkindrawing
Victor Costan
Ilya Epifanov
Brian Coca
Serge van Ginderachter
Benno Joy