Commit Graph

4946 Commits (9e1bc434c768dab26468220de4bc57490f5666cd)

Author SHA1 Message Date
Abhijit Menon-Sen f91ad3dabe Don't pass the cipher around so much
It's unused and unnecessary; VaultLib can decide for itself what cipher
to use when encrypting. There's no need (and no provision) for the user
to override the cipher via options, so there's no need for code to see
if that has been done either.
9 years ago
Abhijit Menon-Sen 017566a2d9 Use AES256 if the cipher is not write-whitelisted 9 years ago
Abhijit Menon-Sen 47bcdf5952 Remove incorrect copy-pasted comment 9 years ago
Thomas Quenolle c948af3b1e Synchronize fix error
Fix the error:
 "RuntimeError: dictionary changed size during iteration"
9 years ago
James Cammarata 601a1cc6d9 Multiple fixes for include statements and blocks in general
Fixes #11981
Fixes #11995
Fixes #12039
Fixes #12077
9 years ago
Brian Coca 154754ae50 pushed module_loader to task_queue_manager so all cli's can benefit from it
also normalized -M option across all cli
fixes #12016
9 years ago
Toshio Kuratomi d2c948dd6a Remove decrypted vault temp_file mistakenly left from patch making vault edit idempotent
This bug was introduced in commit f8bf2ba on July 27.  Hasn't gone out
in a release yet.
9 years ago
Toshio Kuratomi 56ae3a032f Merge pull request #12075 from ansible/fix-vault-unicode
Unicode and other fixes for vault
9 years ago
Toshio Kuratomi a3fd4817ef Unicode and other fixes for vault 9 years ago
Toshio Kuratomi 16e8a7dd67 Merge pull request #11767 from amenonsen/vault-new-password-file
add option to ansible-vault to read new password from file for rekey
9 years ago
Toshio Kuratomi 156feec264 Merge pull request #11650 from objectified/feature-docker-connection
allow ansible to connect to docker containers (without using ssh)
9 years ago
Abhijit Menon-Sen 8bf0dbb7a9 Use [x:y] host ranges instead of [x-y]
This commit deprecates the earlier groupname[x-y] syntax in favour of
the inclusive groupname[x:y] syntax. It also makes the subscripting
code simpler and adds explanatory comments.

One problem addressed by the cleanup is that _enumeration_info used to
be called twice, and its results discarded the first time because of the
convoluted control flow.
9 years ago
Abhijit Menon-Sen 73f10de386 Document the behaviour of _match_one_pattern in some detail
The possibilities are complicated enough that I didn't want to make
changes without having a complete description of what it actually
accepts/matches. Note that this text documents current behaviour, not
necessarily the behaviour we want. Some of this is undocumented and may
not be intended.
9 years ago
Abhijit Menon-Sen fa6ffa1dbd Remove & and ! pattern prefixes as early as possible
Now everything under _match_one_pattern can ignore them. This also means
that we can use the cache to return the same results for 'foo' and '!foo'.
9 years ago
Abhijit Menon-Sen 704c3815d3 Reorder functions into a logical sequence based on usage
There are no code changes; this is committed separately so as to make
the subsequent "real" diffs easier to read.
9 years ago
Richard Poole 3090a45891 add option to ansible-vault to read new password from file for rekey
The --new-vault-password-file option works the same as
--vault-password-file but applies only to rekeying (when
--vault-password-file sets the old password). Also update the manpage
to document these options more fully.
9 years ago
Brian Coca ae91cdfc98 fixed environment inheritance 9 years ago
Brian Coca 8aa732e0a4 allow for lists, sets and dicts to default to None, now return empty type in post processing
remove defaults from inhertiable fieldattributes to allow for proper detection and override
9 years ago
Marius Gedminas 44c94328c8 Speed up execution
`if method in dir(self):` is very inefficient:

- it must construct a list object listing all the object attributes & methods
- it must then perform a O(N) linear scan of that list

Replace it with the idiomatic `if hasattr(self, method):`, which is a
O(1) expected time hash lookup.

Should fix #11981.
9 years ago
Rene Moser 3db4039ad1 cloudstack: implement general api_region support, update docs 9 years ago
objectified b1785a0361 replace compare_versions() with distutils.version 9 years ago
objectified c39fb43ad9 added Maintainer comment header 9 years ago
Toshio Kuratomi 1f7b0fee0a Fixes #12076 9 years ago
Brian Coca 17060f9849 remove +1 from size that was cutting off first char of copied files when a recursive dir
fixes #12055
9 years ago
Toshio Kuratomi 6e107d2f22 Comments pointing the way towards substituting cryptography for pycrypto 9 years ago
Brian Coca 16f3f8e244 now does not error out when notes are not included in module 9 years ago
objectified d9723069c5 align exec_command() definition with local.py 9 years ago
objectified 3a5522a22c fake being connected for logging purposes 9 years ago
objectified 8f2a6a9fae use docker cp when docker >=1.8.0 9 years ago
objectified 2de773477f allow ansible to connect to docker containers 9 years ago
James Cammarata 21e421ce53 Validate required list items are not None or empty strings
Fixes #12011
9 years ago
James Cammarata db65503778 Revert "Add PowerShell exception handling and turn on strict mode." 9 years ago
Abhijit Menon-Sen 3aedc0bca9 Don't insist on ansible-vault taking only one filename parameter
Apart from ansible-vault create, every vault subcommand is happy to deal
with multiple filenames, so we can check that there's at least one, and
make create check separately that there aren't any extra.
9 years ago
Brian Coca f1b8323b62 fixed host/group var loading when inventory is a directory 9 years ago
Brian Coca af06a97f17 kept vars as alias to hostvars[inventory_hostname] and avoid subtrees into themselves 9 years ago
Brian Coca 3ccfebc9f7 Merge pull request #12047 from cchurch/powershell_common_cleanup
Add PowerShell exception handling and turn on strict mode.
9 years ago
Brian Coca a4ffa09414 Merge pull request #11880 from bcoca/configurable_squash
made squashable with_ plugin list configurable
9 years ago
Abhijit Menon-Sen 09e4eac2e5 Use rsplit(':',1) for clarity; no functional changes 9 years ago
Ryan Petrello 1886307845 Fix a parsing bug that prevents IPv6 addresses from being used with `add_host`
Closes #8682
9 years ago
Chris Church 4b2cdadc98 Add PowerShell exception handling and turn on strict mode.
* Add exception handling when running PowerShell modules to provide exception message and stack trace.
* Enable strict mode for all PowerShell modules and internal commands.
* Update common PowerShell code to fix strict mode errors.
* Fix an issue with Set-Attr where it would not replace an existing property if already set.
* Add tests for exception handling using modified win_ping modules.
9 years ago
Brian Coca 47d9e7ca93 Merge pull request #11984 from Alphadelta14/devel
Support any Mapping for with_dict lookup.
9 years ago
James Cammarata 0958edfc7c Submodule pointer update 9 years ago
Brian Coca e8157eab19 now output works for both search and info 9 years ago
Brian Coca a6c0661d21 made src more prominent 9 years ago
Brian Coca 6ffd9c3025 draft galaxy cli search
TODO: paging results
9 years ago
James Cammarata e282309f6d Make sure the inventory restriction is not None 9 years ago
James Cammarata 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
9 years ago
Brian Coca 144da7e7d1 Merge pull request #11765 from ldx/vault_pbkdf2hmac
Use PBKDF2HMAC() from cryptography for vault keys.
9 years ago
Brian Coca f150fe2c23 moved mandatory back to filters as it does not always return a boolean, it does an exception on failure 9 years ago
Brian Coca 2787b3acac ported consul_kv lookup from v1 9 years ago
Brian Coca 74079db8d2 ported dig lookup from v1 9 years ago
Brian Coca 9bb95b5235 Merge pull request #12031 from amenonsen/deadcode
Remove unused (copied) _before_comment method
9 years ago
Brian Coca f6b6ed530b added file tests 9 years ago
Brian Coca cd4a0c70b0 isnotanumber is not needed as jinja2 has builtin number test 9 years ago
Brian Coca fe06577ac2 fixed mandatory test 9 years ago
Abhijit Menon-Sen 599ad9cb51 Remove unused (copied) _before_comment method
This was copied from inventory/ini.py, but the rewritten version doesn't
use it, and shows that it isn't needed.
9 years ago
Toshio Kuratomi b5a078a385 update submodule refs 9 years ago
Abhijit Menon-Sen 745ecd4845 Sanitize IPv6 hostname/port handling
Now we accept IPv6 addresses _with port numbers_ only in the standard
[xxx]:NN notation (though bare IPv6 addresses may be given, as before,
and non-IPv6 addresses may also be placed in square brackets), and any
other host identifiers (IPv4/hostname/host pattern) as before, with an
optional :NN suffix.
9 years ago
Abhijit Menon-Sen 74aab6f726 Use a self._raise_error helper and avoid passing the lineno around
Based on a patch by @Richard2ndQuadrant.
9 years ago
Abhijit Menon-Sen 9133cd409c Make _parse take an array of input lines as an argument
(There's no compelling reason to do this right now, but should be parser
need to be called multiple times in future, this makes it easier.)
9 years ago
Abhijit Menon-Sen 98a1905796 Rename 'section' to 'groupname' to better reflect its purpose 9 years ago
Abhijit Menon-Sen 1284c49bd7 Rewrite the INI InventoryParser
The new code parses INI-format inventory files in a single pass using a
well-documented state machine that reports precise errors and eliminates
the duplications and inconsistencies and outright errors in the earlier
three-phase parsing code (e.g. three ways to skip comments). It is also
much easier now to follow what decisions are being taken on the basis of
the parsed data. The comments point out various potential improvements,
particularly in the area of consistent IPv6 handling.

On the ornate marble tombstone of the old code, the following
inscription is one last baffling memento from a bygone age:

-    def _before_comment(self, msg):
-        ''' what's the part of a string before a comment? '''
-        msg = msg.replace("\#","**NOT_A_COMMENT**")
-        msg = msg.split("#")[0]
-        msg = msg.replace("**NOT_A_COMMENT**","#")
-        return msg
9 years ago
Jon Hawkesworth a46b500851 Add win_splitdrive filter for windows users 9 years ago
Toshio Kuratomi 4f32a61504 Merge pull request #10957 from feanil/feanil/retain_nonetypes
Don't convert nulls to strings.
9 years ago
Brian Coca e8b86f448d fix issue with improper connection override in delegation 9 years ago
Feanil Patel 892e230514 Don't convert nulls to strings.
This change is similar to https://github.com/ansible/ansible/pull/10465

It extends the logic there to also support none types.  Right now if you have
a '!!null' in yaml, and that var gets passed around, it will get converted to
a string.

eg. defaults/main.yml
```
ENABLE_AWESOME_FEATURE: !!null # Yaml Null
OTHER_CONFIG:
  secret1: "so_secret"
  secret2: "even_more_secret"

CONFIG:
  hostname: "some_hostname"
  features:
    awesame_feature: "{{ ENABLE_AWESOME_FEATURE}}"
  secrets: "{{ OTHER_CONFIG }}"
```

If you output `CONFIG` to json or yaml, the feature flag would get represented in the output
as a string instead of as a null, but secrets would get represented as a dictionary.  This is
a mis-match in behaviour where some "types" are retained and others are not.  This change
should fix the issue.

I also updated the template test to test for this and made the changes to v2.

Added a changelog entry specifically for the change from empty string to null as the default.

Made the null representation configurable.

It still defaults to the python NoneType but can be overriden to be an emptystring by updating
the DEFAULT_NULL_REPRESENTATION config.
9 years ago
Brian Coca 22a69e2498 fixes to delegation code 9 years ago
Brian Coca 36cbd771a4 changed fixme to deprecated 9 years ago
Brian Coca 961bee00d5 centralized the definition of 'localhost' 9 years ago
Rene Moser d16429b59c cloudstack: rename returns for consistency 9 years ago
Abhijit Menon-Sen 2641f70e47 Reset self._groups_cache in refresh_inventory 9 years ago
Harald Laabs 73d6da757f Make get_group run in O(n*log(n)) instead of O(n^2) by using a cache 9 years ago
Brian Coca 1b810e3101 Merge pull request #12000 from bcoca/local_action_connect
changed local_action to alias to connection=local vs delegate_to=locahost
9 years ago
Will West b8865314ec improve ansible start up time for very large inventory
first off, we add an oddly slow basic test of 10k item inventory

Before:
```
Ran 229 tests in 13.214s

OK

real    0m13.403s
user    0m12.106s
sys 0m1.155s
```

After:
```
Ran 230 tests in 21.328s

OK

real    0m21.516s
user    0m20.099s
sys 0m1.275s
```

since that seems like a bit long for the test to add to runtime, lets profile

`python -m cProfile -s time ./bin/ansible all -i test/units/inventory_test_data/huge_range --list-hosts`

Before:
```
         1272607 function calls (1259689 primitive calls) in 8.497 seconds

   Ordered by: internal time

   ncalls  tottime  percall  cumtime  percall filename:lineno(function)
    10000    4.393    0.000    4.396    0.000 __init__.py:395(_get_host)
    20000    2.695    0.000    2.697    0.000 __init__.py:341(__append_host_to_results)
    40369    0.113    0.000    0.113    0.000 {posix.lstat}
    50006    0.102    0.000    0.153    0.000 __init__.py:1490(combine_vars)
    40008    0.089    0.000    0.202    0.000 __init__.py:1546(_load_vars_from_path)
    20195    0.088    0.000    0.088    0.000 {posix.stat}
    10011    0.087    0.000    0.087    0.000 {posix.getcwd}
```

The top two lines are promising optimization targets

- populate Inventory's host cache more in _get_host, as we are looping
  over all the groups anyways.

- eliminate duplicate check of whether we've already included a host
  in the construction around __append_host_to_results we can infer
  presence of a host in the results list implies the presence of its
  name in the hostnames set, allowing us to only to the less expensive
  of the two checks

After:
```
         1252610 function calls (1239692 primitive calls) in 1.320 seconds

   Ordered by: internal time

   ncalls  tottime  percall  cumtime  percall filename:lineno(function)
    40369    0.105    0.000    0.105    0.000 {posix.lstat}
    50006    0.094    0.000    0.141    0.000 __init__.py:1490(combine_vars)
    40008    0.081    0.000    0.184    0.000 __init__.py:1546(_load_vars_from_path)
    10011    0.080    0.000    0.080    0.000 {posix.getcwd}
    20195    0.074    0.000    0.074    0.000 {posix.stat}
    10002    0.069    0.000    0.261    0.000 __init__.py:1517(load_vars)
```
9 years ago
Brian Coca 7a4a156d91 changed local_action to alias to connection=local vs delegate_to=localhost
fixes #11998, but still leaves issue of delegate_to: localhost not working
9 years ago
Brian Coca f2c6785897 Merge pull request #11989 from bcoca/osx_queue_fix
changed check to avoid OS X broken sem_getvalue()
9 years ago
Brian Coca 26ed50ecdf fixed indent 9 years ago
Brian Coca 2198f48f54 changed check to avoid OS X broken sem_getvalue()
fixes #11988
9 years ago
Brian Coca e081a73aa1 make new inventory config take precedence over old hostfile config
fixes #11907
9 years ago
Brian Coca 17b4b1f85c added ability to limit in ansilbe pull
refactored the options a bit, new inventory_opts made sense to always group
fixes #7917
9 years ago
Brian Coca 1acb29ff9b sequence will now run once for start=end, added test to suite
fixes #11979
9 years ago
Brian Coca ee21ebaffc Merge pull request #11975 from mutemule/become_doas
Add become support for OpenBSD doas
9 years ago
Damian Gerow 1c5611100e Add become support for OpenBSD doas 9 years ago
Alphadelta14 77b60a1a67 Support any Mapping for with_dict lookup.
This resolves 3939348286 breaking `with_dict: hostvars`.
9 years ago
Brian Coca c419cacb04 check if host task is none before continuing
fixes #11982
9 years ago
James Cammarata 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
9 years ago
Brian Coca 4068598c15 Merge pull request #11977 from resmo/for-ansible
cloudstack: add more common returns
9 years ago
Rene Moser 2913d2b44d cloudstack: add more common returns 9 years ago
Brian Coca 6058eaa92f removed unused poller 9 years ago
Brian Coca 9b61cf5840 implemented async tasks in adhoc v2 9 years ago
Brian Coca ee2e31b37a now passes the test of skipping list when dict attribute is undefined, added deprecation warning as this seems like bad behaviour 9 years ago
Brian Coca 950622cebd made sure they all look in files/vars/template dirs also when executed in play and not only from task 9 years ago
Brian Coca 861fdfc5ba updated callbacks to properly test diff no matter if dict or list 9 years ago
Brian Coca 79ea6d3a1e copy now passes a list of diffs 9 years ago
Brian Coca c3372936aa diff can now be a list 9 years ago
Brian Coca 13c91ef9d4 actually use the read source contents for the diff 9 years ago
Brian Coca 45cebd283f added remote_src to copy, now allows copying to be done on the target server 9 years ago
Brian Coca 1b7369cc8d added diff to assemble for remote_src=false 9 years ago
Brian Coca f048aca5f6 runas placeholder 9 years ago
Brian Coca 49eb95e2d1 some fixes to become/sudo
* now it uses -n to get immediate error if no password is supplied and one is needed,
   this should fix the issue with sudo hanging waiting for input.
 * made -k configurable, this can break changing become_users in play if left out,
   but opens up the possiblity of OTP support.
9 years ago
James Cammarata 4836641683 Use ansible_python_interpreter value for remote checksums
Fixes #11968
Fixes #11969
9 years ago
Brian Coca 7a51836530 check for failure in fact gathering 9 years ago
Brian Coca 1edae51e05 added generic service module, step #1 to separating services to their own modules
falls back to current service module and requries service mgr facts and new service modules
9 years ago
Brian Coca 172e0c328c fixed adhoc fact gathering 9 years ago
Brian Coca 0381923333 fixed call to setup module 9 years ago
Brian Coca 92e2f54228 fixed issues with utf-8 encoding in docs, moved pager to use display class instad of bare prints 9 years ago
Brian Coca 245e0dd4b7 made returns from next task consistent to avoid typeerrors, also linear now checks for none
fixes #11965
9 years ago
Brian Coca 9f5e4c0ef6 lookup plugin that does no flattening 9 years ago
Abhijit Menon-Sen 8f231ec469 Tweak deprecation warning, and apply it to --limit also 9 years ago
James Cammarata 4714cbeec8 Override post validation of environment to allow bare variables
Also prints a deprecated warning if a bare variable is detected, so
that we can remove this in a future version.

Fixes #11912
9 years ago
James Cammarata 4dba30ccd0 Cleanup missed merge conflict sections 9 years ago
Abhijit Menon-Sen d41db8edd6 Don't accept undocumented "p1;p2" patterns; note in changelog
The correct (and now only) way to say p1 OR p2 is "p1:p2".
9 years ago
Abhijit Menon-Sen 1437b8e120 Introduce _split_pattern to parse an "x:y:z" pattern
This function takes a string like 'foo:bar[1:2]:baz[x:y]-quux' and
returns a list of patterns ['foo', 'bar[1:2]', 'baz[x:y]-quux'], i.e.
splits the string on colons that are not part of a range specification.
9 years ago
James Cammarata 32034feec5 Add deprecation warning regarding host patterns 9 years ago
Abhijit Menon-Sen 6bf6b9fdbb Rename some internal functions, clarify what they do
get_hosts → used externally, not changed
_get_hosts → _evaluate_patterns (takes a list, evaluates ! and &)
__get_hosts → _match_one_pattern (takes one pattern only, ignores !&)
9 years ago
Abhijit Menon-Sen eff33bac49 Don't accept undocumented "p1;p2" patterns; note in changelog
The correct (and now only) way to say p1 OR p2 is "p1:p2".
9 years ago
Abhijit Menon-Sen 8aaa06dd50 Introduce _split_pattern to parse an "x:y:z" pattern
This function takes a string like 'foo:bar[1:2]:baz[x:y]-quux' and
returns a list of patterns ['foo', 'bar[1:2]', 'baz[x:y]-quux'], i.e.
splits the string on colons that are not part of a range specification.
9 years ago
Abhijit Menon-Sen baf637b9ae Remove dead code: Inventory.also_restrict_to/lift_also_restriction
This was used earlier to implement serial, but that's now done using
restrict_to_hosts() (whose docstring is also suitably adjusted here)
and there are no more callers.
9 years ago
James Cammarata 6c036c3633 Template parent include file paths
Fixes #11955
9 years ago
Brian Coca b905f51341 fixed typo 9 years ago
Brian Coca 8af0ff4a58 Merge pull request #11567 from lekum/shelvefile_lookup
Add shelvefile lookup plugin
9 years ago
Brian Coca fbc7224066 Merge pull request #11643 from bcoca/meta_inventory_and_fixes
Meta inventory and fixes
9 years ago
James Cammarata eb381bd522 Add one more search path to path_dwim_relative 9 years ago
Brian Coca c6733cc1a7 Merge pull request #9225 from qvicksilver/aix_unprivileged
AIX unprivileged facts collection
9 years ago
Brian Coca 5027f66562 Merge pull request #11864 from jhawkesworth/win_path_filters
add win_basename and win_dirname filters
9 years ago
James Cammarata a498876bec Make sure playbook includes use unique var dictionaries before modification 9 years ago
Brian Coca 5fec11f513 capture parsing exceptions and give nice error and location 9 years ago
Brian Coca 621b18c6ef fixed source path discovery for unarchive in roles
fixes #11943
9 years ago
Brian Coca 70d024ffce show errors when missing vars file or when there is syntax issue in the file
fixes #11945
9 years ago
Brian Coca 3d9875773b Merge pull request #11947 from resmo/for-ansible
cloudstack: refactor get_result()
9 years ago
Brian Coca 2c34a5bdbd pass list correctly to lookup 9 years ago
James Cammarata dd67b1e4d6 Adjust relative include searches when roles are involved
Fixes #11895
9 years ago
Rene Moser 4f3c863b42 cloudstack: refactor get_result()
* A commen dict of keys has been defined, which we look in results returned from the API.
* self.returns dict can be use in subclass to extend this dict.
* Optionally the key name can be replaced with a new key name, often used to make the return keys identical to the arguments passed.
* Use new style class
9 years ago
James Cammarata d9833f227f Make sure cached data from file loads isn't impacted by modifications
Fixes #11893
9 years ago
Brian Coca 6bceee9a93 now lvs/vg facts are only attempted if binary found 9 years ago
James Cammarata c7dde72aa0 Default listify to converting bare variables again
Since we explicitly set convert_bare=False in the template lookup
code, but still want individual looks that call listify directly to
convert bare variables if needed.
9 years ago
James Cammarata ac66e4001c Fix for variable precedence with tasks/includes
Fixes #11881
9 years ago
Brian Coca 2688edb32b Merge pull request #11940 from alxgu/fix_lvm_facts
bugfix: missing path for lvm facts
9 years ago
Brian Coca 39f81a8fa5 removed unused imports 9 years ago
Brian Coca c27978fa93 minor fixes to pull 9 years ago
Brian Coca 9f29e39dea give more matching options for ansible-pull 9 years ago
Brian Coca e46b1e8d2b adjusted tree to work more like v1, also now skips when dir not supplied 9 years ago
Alexander Gubin 1ea1b9fb13 bugfix: missing path for lvm facts 9 years ago
Brian Coca 49d88cef9c meta: refresh_inventory and several inventory fixes 9 years ago
Brian Coca 8e30e3791e Merge pull request #11811 from amenonsen/fixme-range
FIXME in host range parsing
9 years ago
Brian Coca ae9d264b86 Merge pull request #11762 from amenonsen/9795-rebase
Add LVM facts to setup module
9 years ago
James Cammarata 829a88b906 Disable undefined error failures during conditional templating
This allows us to properly catch the 'is defined' and 'is undefined'
checks and return the correct boolean result.

Fixes #11892
9 years ago
James Cammarata e0b074000e Merge pull request #11764 from lpirl/devel_v2
fixes remote code execution for su/sudo with strict remote umasks
9 years ago
James Cammarata 38eb53de1d Fix bug in vars using correct temp value for vars
Fixes #11877
9 years ago
Brian Coca 4d853a5d3c implemented for v2, missing --tree option for adhoc 9 years ago