Commit graph

18684 commits

Author SHA1 Message Date
James Cammarata
ae21d98955 Properly use check_raw when using parse_kv in cli/ code
Fixes ansible-modules-core#3070
2016-03-21 11:00:44 -04:00
Toshio Kuratomi
407f8f934e Merge pull request #14976 from xiaket/devel
use __mro__ for plugin loading when we search for its base class.
2016-03-21 07:32:07 -07:00
Brian Coca
636871c2c0 Merge pull request #13377 from bruceharbin/patch-1
Update intro_windows.rst
2016-03-21 07:28:48 -07:00
Brian Coca
92c887d1ed Merge pull request #14730 from chouseknecht/docker_image_proposal
Upated docker_image_module proposal
2016-03-21 07:21:26 -07:00
Brian Coca
4a01a5fbce Merge pull request #14733 from chouseknecht/docker_files_proposal
Adding docker_files module proposal.
2016-03-21 07:21:15 -07:00
Brian Coca
d026bc5e17 Merge pull request #14471 from willdurand/contrib-do-inventory
[contrib] Add option to define group vars in DigitalOcean dynamic inventory script
2016-03-21 07:17:46 -07:00
Brian Coca
47bcceeaf3 Merge pull request #15065 from hyperized/devel
Replacement issue for #14747
2016-03-21 06:42:58 -07:00
Gerben Geijteman
c7e1a65da4 Proposed change to documentation to elaborate on new notation style for with_items / with_subelements 2016-03-21 14:35:05 +01:00
夏恺(Xia Kai)
38092dcc27 import the base class and check whether this obj has the required base class.
Signed-off-by: 夏恺(Xia Kai) <xiaket@gmail.com>
2016-03-21 07:21:54 +00:00
Toshio Kuratomi
9053d0468e Merge pull request #15006 from ansible/local-pipelining
Add changes necessary for enabling pipelining for local connections
2016-03-20 22:12:07 -07:00
James Cammarata
7460f76f8d Merge pull request #15052 from mattclay/travis-docker-ssh
Add ssh client and server to docker containers.
2016-03-20 16:41:10 -04:00
Matt Clay
4224c11b5f Combine new RUN commands into one RUN command. 2016-03-20 10:48:11 -07:00
Toshio Kuratomi
6824f3a7cc Change url so that we don't test https in the tests for file perms 2016-03-20 08:49:40 -07:00
James Cammarata
9d2fe2fb2c Fixing role param precedence issues
* Make role param resolution follow the role dependency chain, rather
  than using all roles within the play
* Also move params to be merged in after role vars in general, to match
  our variable precedence rules
* Changes to the way var lookup is done in role helper methods for
  get_vars(), get_inherited_vars(), and get_role_params() to make the
  above possible without trampling on previously merged vars

Fixes #14472
Fixes #14475
2016-03-20 11:09:32 -04:00
Toshio Kuratomi
4a00999875 Update to latest git submodules 2016-03-20 08:03:58 -07:00
Toshio Kuratomi
cbd93b6ad3 Add integration test for #11821 2016-03-20 07:59:00 -07:00
Toshio Kuratomi
b80c9b5032 Merge pull request #15049 from mattclay/paramiko-unicode
Add missing to_bytes for cmd.
2016-03-19 22:37:23 -07:00
Matt Clay
da99e4e0aa Add ssh client and server to docker containers.
This will allow for future integration tests using ssh to localhost
from within docker containers running on Travis.
2016-03-19 21:33:23 -07:00
Michael Scherer
49f8376051 Fix small error (thse => these) 2016-03-20 00:20:32 +01:00
Matt Clay
24c4384f0e Add missing to_bytes for cmd. 2016-03-19 11:13:38 -07:00
James Cammarata
e4a5bcae3c Merge pull request #14679 from dagwieers/merge_hash_v2
Avoid merging a dict and a AnsibleUnicode
2016-03-19 12:58:42 -04:00
James Cammarata
eafeab4ab5 Merge pull request #14508 from brianlycett/patch-1
Update YAMLSyntax.rst
2016-03-19 12:15:18 -04:00
James Cammarata
d9f398ec91 Merge branch 'a13m-destination_format' into devel 2016-03-19 09:13:22 -04:00
James Cammarata
c9da48d5ba Merge branch 'destination_format' of https://github.com/a13m/ansible into a13m-destination_format 2016-03-19 09:05:14 -04:00
Brian Coca
e1ee2ed5a5 Merge pull request #13550 from KrzysiekJ/connect_to_region-wrap
Use wrapped connect_to_region everywhere in ec2.py
2016-03-18 21:25:55 -07:00
Brian Coca
24ed7b65d0 minor changelog updates 2016-03-18 20:51:39 -07:00
Brian Coca
8838ed055c Merge pull request #14872 from bcoca/ec2_inv_page_rds
page rds instances
2016-03-18 20:36:46 -07:00
Brian Coca
7a5ff16aee Merge pull request #15042 from RNanney/RNanney-validate_certs
Update nxos.py
2016-03-18 19:32:32 -07:00
Toshio Kuratomi
f5654dced9 Merge pull request #15043 from mattclay/docker-user
Use docker exec -u only when supported.
2016-03-18 18:46:46 -07:00
Matt Clay
ea1a6c56b9 Use docker exec -u when needed and if supported.
If remote_user is given and cannot be set in docker, a warning will
be displayed unless the default container user matches remote_user.
2016-03-18 18:19:41 -07:00
Rene Moser
3fda5e65d4 changelog: add cloudflare_dns 2016-03-19 00:12:53 +01:00
RNanney
8bceff5136 Update nxos.py 2016-03-18 15:55:41 -05:00
James Cammarata
93542b3666 Merge pull request #14964 from keedya/devel
Fixing bug in the output format when displaying 2 or more hosts
2016-03-18 16:38:58 -04:00
Brian Coca
eceabec71f page rds instances
fix #14861
2016-03-18 13:31:52 -07:00
James Cammarata
13f3cbaf3b Renaming per-item and retry callbacks 2016-03-18 15:17:43 -04:00
Toshio Kuratomi
959711b56e Merge pull request #14993 from karmab/ovirt_connection_fix
Fixes ovirt inventory to only override credentials when keys exist
2016-03-18 11:02:14 -07:00
karimb
421fb6df8b Fixes ovirt inventory to only override credentials from environment when keys exist 2016-03-18 18:47:20 +01:00
nitzmahone
b95286c88e re-integrate test_test_infra output checking
added secondary run with overridden inventory/test args per bcoca request
2016-03-18 10:14:22 -07:00
Toshio Kuratomi
60c943997b More doc updates regarding ansible_shell_executable 2016-03-18 09:16:21 -07:00
Toshio Kuratomi
8bdf0d4746 And another doc fix 2016-03-18 09:09:31 -07:00
Toshio Kuratomi
08394df8d0 Update submodule links for docs fixes 2016-03-18 09:06:05 -07:00
Toshio Kuratomi
287fd29db9 Use better rst markup (main change definition lists instead of code-blocks for config file options 2016-03-18 08:52:21 -07:00
nitzmahone
6578e63e63 improve test_test_infra debug messaging, rc check 2016-03-18 08:51:43 -07:00
Abhijit Menon-Sen
f82639e4a2 Fix the other typo from #15036 2016-03-18 21:08:41 +05:30
Brian Coca
95495a6b38 fixed typo
fixes #15036
2016-03-18 08:35:00 -07:00
Abhijit Menon-Sen
efdac490ff Merge pull request #14924 from mvgrimes/patch-1
Dynamically add ssl key to the mysql config hash iff needed
2016-03-18 20:38:33 +05:30
Brian Coca
06e6513276 Merge pull request #15023 from bpsuntrup/documentation_issue_15022
Clarify developing modules documentation
2016-03-18 08:07:55 -07:00
Toshio Kuratomi
bdf90d20dd Add :Z to mount the volume. This is a docker-1.7+ option that makes the mount properly relabel for selinux 2016-03-18 07:47:09 -07:00
Brian Coca
d43fc631dd mount facts now include network mounts (nfs) 2016-03-18 07:28:53 -07:00
SUNTRUP
3bfb556cb9 Clarify developing modules documentation
This resolves issue #15022. When doing the module tutorial, it might be
necessary for the user to read through the documentation for installing
from source to avoid dependency errors and such.
2016-03-18 09:12:17 -05:00