Commit graph

17698 commits

Author SHA1 Message Date
James Cammarata
6a252a3f77 Preserve the cumulative path for checking includes which have parents
Otherwise, each relative include path is checked on its own, rather
than in relation to the (possibly relative) path of its parent, meaning
includes multiple level deep may fail to find the correct (or any) file.

Fixes #13472
2015-12-16 11:23:06 -05:00
Toshio Kuratomi
0095d04af9 Update submodule refs 2015-12-16 08:02:46 -08:00
Toshio Kuratomi
7d519127fe Merge pull request #13573 from ansible/ssl-context-with-proxy
Fix a few problems with url handling.
2015-12-16 08:00:59 -08:00
Brian Coca
a057f748ea Merge pull request #13572 from Ykid/patch-1
Fix typo
2015-12-16 10:49:24 -05:00
Toshio Kuratomi
33863eb653 Conditionally create the CustomHTTPSConnection class only if we have the required baseclasses.
Fixes #11918
2015-12-16 07:47:09 -08:00
Toshio Kuratomi
72a0654b81 Fixes for proxy on RHEL5 2015-12-16 07:47:07 -08:00
Toshio Kuratomi
73ead4fbba First attempt to fix https certificate errors through a proxy with python-2.7.9+
Fixes #12549
2015-12-16 07:46:54 -08:00
David
63b624707d Fix typo 2015-12-16 23:46:06 +08:00
Brian Coca
97275110d7 Merge pull request #13533 from bcoca/debug_fixes
debug now validates its params
2015-12-16 10:36:20 -05:00
James Cammarata
fcc9258b74 Use the original host rather than the serialized one when processing results
Fixes #13526
Fixes #13564
Fixes #13566
2015-12-16 01:48:22 -05:00
Toshio Kuratomi
d203438a2c Merge pull request #13554 from Yannig/devel_fix_python3_tests
Use six lib to import urlparse properly.
2015-12-15 07:55:56 -08:00
Brian Coca
be5488cb60 clean debug output to match prev versions 2015-12-15 09:27:53 -05:00
Brian Coca
a0842781a6 renamed ssh.py shared module file to clarify 2015-12-15 08:45:12 -05:00
Brian Coca
8668e8df69 Merge pull request #13555 from privateip/shared_module_ssh
adds support for using ssh keys to ssh shared module
2015-12-15 08:35:26 -05:00
Yannig Perré
be4d1f9ee3 Fix a part of python 3 tests (make tests-py3, see https://github.com/ansible/ansible/issues/13553 for more details). 2015-12-15 13:37:35 +01:00
Peter Sprygada
27cd7668c1 the ssh shared module will try to use keys if the password is not supplied
The current ssh shared module forces only password based authentication.  This
change will allow the ssh module to use keys if a password is not provided.
2015-12-15 07:16:28 -05:00
Brian Coca
5d1a2eac3e Merge pull request #13500 from mscherer/fix_markup_doc_modules
Fix the markdown used for the Windows module section
2015-12-14 18:43:18 -05:00
Toshio Kuratomi
8d16638fec Fix for template module not creating a file that was not present when force=false 2015-12-14 10:55:21 -08:00
Toshio Kuratomi
d31d04a1e0 Merge pull request #13545 from mscherer/fix_know_hosts_ipv6
Make module_utils.known_hosts.get_fqdn work on ipv6
2015-12-14 10:51:12 -08:00
Michael Scherer
a7ac98262d Make module_utils.known_hosts.get_fqdn work on ipv6 2015-12-14 19:30:54 +01:00
Brian Coca
938c26d952 Merge pull request #13544 from emonty/inventory-config
Add OpenStack Inventory configuration
2015-12-14 13:22:19 -05:00
Toshio Kuratomi
1a168619d3 Merge pull request #13546 from gparent/patch-1
Fix typo in galaxy.rst
2015-12-14 09:14:18 -08:00
gp
e595c50197 Fix typo in galaxy.rst
Fix typo
2015-12-14 12:06:35 -05:00
Toshio Kuratomi
457f86f61a Minor: Correct type pyhton => python 2015-12-14 08:50:37 -08:00
Toshio Kuratomi
c9eb41109f Update submodule refs 2015-12-14 08:03:56 -08:00
Toshio Kuratomi
fc19ad21ef Merge pull request #13494 from Jmainguy/msyql_hash_tests
add tests for encrypted hash mysql_user
2015-12-14 07:58:39 -08:00
James Cammarata
80d23d639c Use an octal representation that works from 2.4->3+ for known_hosts 2015-12-14 10:43:30 -05:00
James Cammarata
6312e38133 Fixing up some non-py3 things for unit tests 2015-12-14 10:35:58 -05:00
Monty Taylor
9f61144401 Optionally only use UUIDs for openstack hosts on duplicates
The OpenStack inventory lists hostnames as the UUIDs because hostsnames
are not guarnateed to be unique on OpenStack. However, for the common
case, this is just confusing.

The new behavior is a visible change, so make it an opt-in via config.

Only turn the hostnames to UUIDs if there are duplicate hostnames.
2015-12-14 10:19:43 -05:00
Jonathan Mainguy
49dc9eea16 add tests for encrypted hash mysql_user 2015-12-14 10:12:06 -05:00
Monty Taylor
1f8e484b70 Fix the refresh flag in openstack inventory
Refresh will update the dogpile cache from shade, but doesn't cause
the ansible side json cache to be invalidated. It's a simple oversight.
2015-12-14 09:59:41 -05:00
James Cammarata
35015aaa4a Merge pull request #13529 from mscherer/add_tests_known_hosts
Add tests for ansible.module_utils.known_hosts
2015-12-14 09:50:23 -05:00
Brian Coca
2a37f11738 Merge pull request #13542 from h0nIg/devel_default_ask
ansible vault, ask pass: use default settings from ansible.cfg
2015-12-14 09:14:48 -05:00
Hans-Joachim Kliemeck
f5f9b2fd35 use default settings from ansible.cfg 2015-12-14 15:04:31 +01:00
James Cammarata
279c5a3596 Cleanup strategy tests broken by new forking strategy 2015-12-14 03:07:20 -05:00
James Cammarata
f8ff63f8c8 A few tweaks to improve new forking code 2015-12-14 03:06:52 -05:00
Brian Coca
89603a0509 added that ansible-pull is now shallow to changelog 2015-12-13 12:19:05 -05:00
Brian Coca
e88334b7da Merge pull request #13535 from robinro/patch-4
add --full flag to ansible-pull man page
2015-12-13 12:13:48 -05:00
Robin Roth
0c954bd142 add --full flag to ansible-pull man page
add --full flag that was added in #13502
2015-12-13 18:00:54 +01:00
Brian Coca
4734a8011e Merge pull request #13534 from ueg1990/patch-1
Fix Doc mistake
2015-12-13 09:46:52 -05:00
Brian Coca
175c2d6510 Merge pull request #13502 from robinro/patch-3
use shallow clones by default in ansible-pull
2015-12-13 09:31:35 -05:00
Toshio Kuratomi
2bc3683d41 Restore comment about for-else since it is an uncommon idiom 2015-12-13 05:55:31 -08:00
chouseknecht
95785f149d Fix docs. The search command works with both galaxy.ansible.com and galaxy-qa.ansible.com. 2015-12-13 05:23:04 -05:00
chouseknecht
06dde0d332 Fixed documentation typos and bits that needed clarification. Fixed missing spaces in VALID_ACTIONS. 2015-12-13 05:23:04 -05:00
chouseknecht
847f454bcc Add a section to intro_configuration for Galaxy. 2015-12-13 05:23:04 -05:00
chouseknecht
342dee0023 Define and handle ignore_certs correctly. Preserve search term order. Tweak to Galaxy docsite. 2015-12-13 05:23:04 -05:00
chouseknecht
f1c72ff8f5 Make sure it is clear that new commands require using the Galaxy 2.0 Beta site. 2015-12-13 05:23:04 -05:00
chouseknecht
bc73920090 Updated ansible-galaxy man page. Removed -b option for import. 2015-12-13 05:23:04 -05:00
chouseknecht
989604b1a3 Fix typo. 2015-12-13 05:23:04 -05:00
chouseknecht
d8e6bc98a2 Fix overloaded options. Show an error when no action given. Don't show a helpful list of commands and descriptions. 2015-12-13 05:23:04 -05:00