Commit graph

18658 commits

Author SHA1 Message Date
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
Brian Coca
b809d23863 fixed typo 2016-03-18 07:04:12 -07:00
Abhijit Menon-Sen
e5460d6a6e Merge pull request #15002 from camradal/devel
add find_host_portgroup_by_name function to vmware utils
2016-03-18 19:32:17 +05:30
Brian Coca
27eecb7262 Merge pull request #15000 from jpic/fix_coveralls
[Travis.yml fix] Install coveralls, required by after_success
2016-03-18 06:54:39 -07:00
Brian Coca
87e16c2263 Merge pull request #15031 from evgeni/modern-debian
prepare packaging for newer Debian/Ubuntu releases
2016-03-18 06:43:24 -07:00
Toshio Kuratomi
e25caebe7a Cleanups to docs and rename of inv var 2016-03-18 06:42:37 -07:00
Toshio Kuratomi
8fc1c26c37 Merge pull request #14936 from bcoca/ansible_executable
add ansible_executable inventory var
2016-03-18 06:41:24 -07:00
Toshio Kuratomi
2ba4428424 Catch ValueError as well because of El Capitan provoking a bug in python2's subprocess
Fixes #14895
2016-03-18 05:52:53 -07:00
Abhijit Menon-Sen
a61a3e28da Merge pull request #9776 from MiLk/fixes/git-repo-info-branch
ansible.utils._git_repo_info() now supports branch names with slashes
2016-03-18 18:08:02 +05:30
Evgeni Golov
0cdbc8b48d backwards compat for python-support on old Debian/Ubuntu releases 2016-03-18 11:07:23 +01:00
Abhijit Menon-Sen
ad0e707f97 Merge pull request #7395 from hkariti/ec2_hostname_variable
Add hostname_variable to ec2 inventory script
2016-03-18 15:37:00 +05:30
Brian Coca
db61e9be0c add ansible_executable inventory var
also handle the overrides appropriately
also new executable to set shell type
2016-03-17 18:54:37 -07:00
Thomas Steinbach
14dfad730e use just 'remote_user' as user for the docker connection 2016-03-17 14:39:44 -07:00
Thomas Steinbach
4ac49ed4a8 use remote_user or become_user in docker connection 2016-03-17 14:39:44 -07:00
Brian Coca
5d9b552317 Merge pull request #15024 from bcoca/delegation_vars_fix
ensure we use delegated vars on delegation
2016-03-17 14:33:36 -07:00
Toshio Kuratomi
ab693579a9 Clarify the document about the order of matryoshka shells
(nesting shells)
2016-03-17 14:29:49 -07:00
James Cammarata
6265d6fd2a Merge pull request #14870 from zyegfryed/patch-1
Fix filtering by project in Cloudstask inventory
2016-03-17 15:57:51 -04:00
James Cammarata
1ee6d489ab Make sure tuples returned by _get_item() are handled correctly in formatting
Fixes #14800
2016-03-17 14:19:58 -04:00
Hagai Kariti
8a17da299f Clean up lines with only whitespaces in ec2.py 2016-03-17 20:06:01 +02:00
Hagai Kariti
53756af546 Added hostname_variable to ec2 inventory 2016-03-17 20:06:00 +02:00
Brian Coca
292be944c6 ensure we use delegated vars on delegation
this prevents falling back to connection vars from the inventory_hostname
when matching connection var is not in delegated host.
2016-03-17 11:03:40 -07:00