summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make default var lookup for tasks follow the dep chainjjshoe_role_default_dep_chain_fixJames Cammarata2016-03-212-2/+5
| | | | Related to #14296 (@jjshoe's follow-up example on that issue)
* Merge pull request #15052 from mattclay/travis-docker-sshJames Cammarata2016-03-206-0/+40
|\ | | | | Add ssh client and server to docker containers.
| * Combine new RUN commands into one RUN command.Matt Clay2016-03-206-28/+28
| |
| * Add ssh client and server to docker containers.Matt Clay2016-03-196-0/+40
| | | | | | | | | | This will allow for future integration tests using ssh to localhost from within docker containers running on Travis.
* | Change url so that we don't test https in the tests for file permsToshio Kuratomi2016-03-201-2/+2
| |
* | Fixing role param precedence issuesJames Cammarata2016-03-202-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Update to latest git submodulesToshio Kuratomi2016-03-202-12/+14
| |
* | Add integration test for #11821Toshio Kuratomi2016-03-201-0/+34
| |
* | Merge pull request #15049 from mattclay/paramiko-unicodeToshio Kuratomi2016-03-191-0/+2
|\ \ | | | | | | Add missing to_bytes for cmd.
| * | Add missing to_bytes for cmd.Matt Clay2016-03-191-0/+2
| |/
* | Fix small error (thse => these)Michael Scherer2016-03-201-1/+1
| |
* | Merge pull request #14679 from dagwieers/merge_hash_v2James Cammarata2016-03-191-1/+1
|\ \ | | | | | | Avoid merging a dict and a AnsibleUnicode
| * | Avoid merging a dict and a AnsibleUnicodeDag Wieers2016-02-261-1/+1
| | | | | | | | | | | | | | | This is the same fix we applied to v1.9 in PR #14565, however it does not fix #14678 completely ! The dictionaries are not being merged as tey are on v1.9.
* | | Merge pull request #14508 from brianlycett/patch-1James Cammarata2016-03-191-2/+40
|\ \ \ | | | | | | | | Update YAMLSyntax.rst
| * | | Update YAMLSyntax.rstbrianlycett2016-02-291-1/+1
| | | | | | | | | | | | Ach - it's double backquotes in this markup.
| * | | Update YAMLSyntax.rstbrianlycett2016-02-291-2/+2
| | | | | | | | | | | | Small updates loosely based on suggestions. :)
| * | | Update YAMLSyntax.rstbrianlycett2016-02-241-6/+9
| | | | | | | | | | | | A brief explanation was added regarding multi-line values.
| * | | Update YAMLSyntax.rstbrianlycett2016-02-161-2/+37
| | | | | | | | | | | | Updated to include a bit more depth in explaining the YAML, along with a link the Wikipedia page on YAML syntax.
* | | | Merge branch 'a13m-destination_format' into develJames Cammarata2016-03-192-1/+22
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'destination_format' of https://github.com/a13m/ansible into ↵James Cammarata2016-03-192-1/+22
| |\ \ \ |/ / / / | | | | | | | | a13m-destination_format
| * | | Flexible tag-based naming for ec2 hostsAndy Grimm2015-07-282-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | Introduces destination_format and destination_format_tags to allow the construction of host names based on one or more ec2 tags and a python format string.
* | | | Merge pull request #13550 from KrzysiekJ/connect_to_region-wrapBrian Coca2016-03-181-2/+2
|\ \ \ \ | | | | | | | | | | Use wrapped connect_to_region everywhere in ec2.py
| * | | | Use wrapped connect_to_region everywhere in ec2.pyKrzysztof Jurewicz2015-12-151-2/+2
| | | | |
* | | | | minor changelog updatesBrian Coca2016-03-181-2/+3
| | | | |
* | | | | Merge pull request #14872 from bcoca/ec2_inv_page_rdsBrian Coca2016-03-181-3/+8
|\ \ \ \ \ | | | | | | | | | | | | page rds instances
| * | | | | page rds instancesBrian Coca2016-03-181-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | fix #14861
* | | | | | Merge pull request #15042 from RNanney/RNanney-validate_certsBrian Coca2016-03-181-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update nxos.py
| * | | | | | Update nxos.pyRNanney2016-03-181-0/+1
| | | | | | |
* | | | | | | Merge pull request #15043 from mattclay/docker-userToshio Kuratomi2016-03-181-33/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use docker exec -u only when supported.
| * | | | | | | Use docker exec -u when needed and if supported.Matt Clay2016-03-181-33/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If remote_user is given and cannot be set in docker, a warning will be displayed unless the default container user matches remote_user.
* | | | | | | | changelog: add cloudflare_dnsRene Moser2016-03-191-0/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #14964 from keedya/develJames Cammarata2016-03-181-4/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fixing bug in the output format when displaying 2 or more hosts
| * | | | | | Bug FixAndre Keedy2016-03-141-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Corrected the format in case of multiple hosts Remove empty spaces
* | | | | | | Renaming per-item and retry callbacksJames Cammarata2016-03-188-29/+32
| | | | | | |
* | | | | | | Merge pull request #14993 from karmab/ovirt_connection_fixToshio Kuratomi2016-03-181-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes ovirt inventory to only override credentials when keys exist
| * | | | | | | Fixes ovirt inventory to only override credentials from environment when ↵karimb2016-03-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys exist
* | | | | | | | re-integrate test_test_infra output checkingnitzmahone2016-03-182-2/+6
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | added secondary run with overridden inventory/test args per bcoca request
* | | | | | | More doc updates regarding ansible_shell_executableToshio Kuratomi2016-03-182-14/+15
| | | | | | |
* | | | | | | And another doc fixToshio Kuratomi2016-03-181-5/+5
| | | | | | |
* | | | | | | Update submodule links for docs fixesToshio Kuratomi2016-03-182-13/+10
| | | | | | |
* | | | | | | Use better rst markup (main change definition lists instead of code-blocks ↵Toshio Kuratomi2016-03-181-59/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for config file options
* | | | | | | improve test_test_infra debug messaging, rc checknitzmahone2016-03-182-5/+9
| | | | | | |
* | | | | | | Fix the other typo from #15036Abhijit Menon-Sen2016-03-181-1/+1
| | | | | | |
* | | | | | | fixed typoBrian Coca2016-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #15036
* | | | | | | Merge pull request #14924 from mvgrimes/patch-1Abhijit Menon-Sen2016-03-181-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Dynamically add ssl key to the mysql config hash iff needed
| * | | | | | | Dynamically add ssl key to the mysql config hash iff needed mvgrimes2016-03-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Just including the `ssl` key in the config for MySQLdb.connect, causes it to check for the existence of SSL support. This patch only adds the key if one of the ssl configuration options is included.
* | | | | | | | Merge pull request #15023 from bpsuntrup/documentation_issue_15022Brian Coca2016-03-181-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clarify developing modules documentation
| * | | | | | | | Clarify developing modules documentationSUNTRUP2016-03-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Add :Z to mount the volume. This is a docker-1.7+ option that makes the ↵Toshio Kuratomi2016-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mount properly relabel for selinux
* | | | | | | | | mount facts now include network mounts (nfs)Brian Coca2016-03-181-2/+2
| | | | | | | | |