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

16542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Coca 2c24fbbd6a Merge pull request #12618 from AdThrive/devel 
Added an option to use the private network IP address for DigitalOcean dynamic inventory
 2015-10-12 11:35:43 -04:00
Brian Coca f5f3bf06e4 Merge pull request #12550 from redrampage/remove-pw-salt-deletion 
Removed deletion of salt by 'password' lookup
 2015-10-12 11:33:19 -04:00
James Cammarata 73661d1761 Merge branch 'devel' of https://github.com/ansible/ansible into devel 2015-10-12 11:30:03 -04:00
James Cammarata 424b623c5d Merge branch 'klshxsh-serial_should_be_string' into devel 2015-10-12 11:29:29 -04:00
James Cammarata 0e1a5919c8 Adding unit tests for PlaybookExecutor _get_serialized_batches 2015-10-12 11:27:37 -04:00
Charles Paul 3d533cb423 fixing calls to fail_json 2015-10-12 08:50:18 -05:00
Brian Coca 50372eecc9 Merge pull request #12455 from privateip/devel 
added methods for retrieving vapp and vm
 2015-10-12 09:37:47 -04:00
James Cammarata 82e76e42e5 Tweak to the way serial percentages are handled 2015-10-12 09:00:43 -04:00
James Cammarata 63e288354e Fix bug in way omitted values were set 2015-10-12 09:00:27 -04:00
James Cammarata 4c85ae0712 Merge branch 'serial_should_be_string' of https://github.com/klshxsh/ansible into klshxsh-serial_should_be_string 2015-10-12 08:28:07 -04:00
klshxsh ac00c9ced7 changed 'string' to 'percent' for _serial 
Note that this allows both integers (e.g. 3) and percentages (e.g. "30%")
Also changed default back to 0 rather than '0'
 2015-10-12 12:41:00 +01:00
James Cammarata eb60ce1b6e Merge pull request #12703 from keitwb/inventory_file_var 
Adding the inventory_file var back
 2015-10-11 16:04:34 -04:00
James Cammarata 71a1a3c903 Submodule pointer update 2015-10-10 22:31:54 -04:00
Ben Keith 1f82971283 Adding the inventory_file var back 2015-10-10 21:54:28 -04:00
Toshio Kuratomi 6292520c45 Merge pull request #12444 from knakayama/bugfix/update-docs 
Update docs (playbooks_loops.rst, playbooks_filters.rst)
 2015-10-09 20:09:53 -07:00
James Cammarata 297aaeac2d Backporting version release stuff from stable-1.9 2015-10-09 22:39:59 -04:00
Toshio Kuratomi d660381f98 Merge pull request #12450 from glnds/devel 
Installation update for people using Fishshell
 2015-10-09 19:39:30 -07:00
Toshio Kuratomi 45a161b0a1 Merge pull request #12429 from edmstudio/devel 
Update synchronize module plugin to work on OS X
 2015-10-09 16:05:46 -07:00
Petr Mifek 6e035a3e94 Move nested function test for ipv6 to top level in synchronize module. 2015-10-10 00:01:22 +02:00
Toshio Kuratomi 676e4232e3 Merge pull request #12438 from lekum/doc_shelvefile_lookup 
Update lookups doc with shelvefile example
 2015-10-09 14:34:51 -07:00
Brian Coca 45788fbfad <homer>doh!</homer> 2015-10-09 16:58:01 -04:00
Brian Coca d24532757c remove fix for local_action/connection local that is now not needed 2015-10-09 16:53:17 -04:00
klshxsh 4a5e52b2d2 The serial keyword can be specified as a percentage, e.g '30%' or a number e.g. '3'; therefore it needs to be a string to allow both types 2015-10-09 21:34:37 +01:00
Toshio Kuratomi 17c75df0ae Merge pull request #12627 from mgedmin/tox 
Add Python 3.5 to tox.ini and Travis
 2015-10-09 11:42:34 -07:00
Brian Coca b9d54e9a01 corrects previous fix to deal with missing item key in results dict 2015-10-09 13:01:32 -04:00
Brian Coca abf2e13955 Revert "Track local_action internally to prevent it from being overridden" 
This reverts commit 49ca0eb797.
 2015-10-09 13:01:32 -04:00
Brian Coca 101c8785ec removed changes to make local action equate connection=local and brought it back to equate delegate_to=localhost 2015-10-09 13:01:32 -04:00
Brian Coca bcb173996b Merge pull request #12695 from matburt/fix_cache_plugins_for_v2 
Fix an issue where cache plugins weren't updated in certain scenarios
 2015-10-09 11:39:58 -04:00
Brian Coca fbf4cafab5 on skipped you 'might' not have an item, changed to getattr to avoid keyerror 
fixes #12683
 2015-10-09 11:28:11 -04:00
Matthew Jones 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
Brian Coca ec02b255c3 Merge pull request #12689 from soarpenguin/bugfix 
Remove some warning of undefined name and fix classmethod syntax error.
 2015-10-09 11:09:50 -04:00
James Cammarata 770032648a Show -> localhost for local_action tasks 2015-10-09 10:53:53 -04:00
James Cammarata f415d39dfd Merge pull request #12690 from stelligent/devel 
Use AWS_DEFAULT_REGION env var if none specified
 2015-10-09 10:02:48 -04:00
James Cammarata cfa62e7a2a Submodule pointer update 2015-10-09 09:50:16 -04:00
James Cammarata 868819f9fa Make sure shlex split is returning properly encoded strings 
Fixes #12676
 2015-10-09 09:49:27 -04:00
Shayne Clausson 55b3f9e4e5 Use AWS_DEFAULT_REGION env var if none specified 2015-10-09 10:27:36 +02:00
soarpenguin b11ea17385 fix classmethod syntax error. 2015-10-09 12:46:31 +08:00
soarpenguin 5efa4d29e3 fix some warning of undefined name. 2015-10-09 12:43:42 +08:00
James Cammarata 59d655c543 Double echo temp directory name to handle spaces and ~ expansion both 
Fixes #12667
 2015-10-08 16:22:38 -04:00
Toshio Kuratomi d1b98ec776 Correct typo 2015-10-08 08:44:25 -07:00
Toshio Kuratomi 2f5e817007 Do not mix byte str with unicode type 2015-10-08 08:31:12 -07:00
Toshio Kuratomi 01ba2e94c0 Wait until later to convert to byte strings for output 
Also some pre-emptive python3 compat and a code simplification
 2015-10-08 08:22:17 -07:00
Brian Coca 76feba00c4 avoid callbacks during syntax check and listing 
fixes #12682
 2015-10-08 10:15:48 -04:00
Brian Coca 4463ced8ba simpler safe output 2015-10-08 10:15:48 -04:00
James Cammarata de792ba3c2 Improve handling of unicode errors 
Fixes #12669
 2015-10-08 10:04:15 -04:00
James Cammarata 5a0f5f1254 Load vars for localhost when created implicitly 
Fixes #12666
 2015-10-08 09:26:20 -04:00
James Cammarata 8f18e6574e Merge pull request #12679 from yfix/devel 
zabbix.py: Added additional ini file search path
 2015-10-08 08:02:14 -04:00
yfix cf7763ab46 Merge pull request #1 from ansible/devel 
update from origin
 2015-10-08 11:46:01 +03:00
Yuri Vysotskiy a2422bfb60 Added additional ini file search path into contrib/inventory/zabbix.py 2015-10-08 11:44:27 +03:00
Brian Coca ae69409d9c added openstack fact modules 2015-10-07 21:38:11 -04:00