Commit graph

19895 commits

Author SHA1 Message Date
Scott Butler
1b52acade8 Fixed indenting in samples. 2016-05-25 13:37:21 -07:00
Scott Butler
9fafe5e143 Merge branch 'devel' of https://github.com/ansible/ansible into devel 2016-05-25 13:19:45 -07:00
Toshio Kuratomi
3b69ef7e8b Add strings 'True' and 'False' as booleans as python bools converted to strings will look that way.
Workaround for custom modules which are using choices=BOOLEANS instead
of type='bool'.
2016-05-25 10:36:16 -07:00
Scott Butler
189ae499cf Typo fix 2016-05-25 07:29:02 -07:00
Scott Butler
9fcb6635fa Typo fixes 2016-05-24 22:00:40 -07:00
Scott Butler
813d4435ca Incorporated additional tech review feedback. 2016-05-24 21:39:59 -07:00
Matt Martz
d08fda9320 Merge pull request #15985 from alikins/vault_keyring_15984_fix
fix vault-keyring.py 'No [vault] section' error
2016-05-24 18:11:29 -05:00
Adrian Likins
675561e116 fix vault-keyring.py 'No [vault] section' error
vault-keyring.py was using an older version of
the ansible.constants.load_config_file() API.
The newer version returns a tuple, which caused
the config load to fail and a catch all exception
to blame it on a missing section.

Update to new API, and catch the ConfigParser error
specifically.

Fixes #15984
2016-05-24 18:47:56 -04:00
Rene Moser
62c424797a cloudstack: add common network code
Also used for VPC support.
2016-05-24 23:18:17 +02:00
Toshio Kuratomi
650bfdce8f Update grep for six to not falsely trigger when six is only a substring of a different library 2016-05-24 13:49:37 -07:00
Brian Coca
de7b0e9da1 made def main an explicit requirement 2016-05-24 15:11:00 -04:00
Toshio Kuratomi
a2bef45cf6 Update submodule refs 2016-05-24 11:52:19 -07:00
Toshio Kuratomi
d45a394f63 Mocate ansible_ssh_changes into a common directory 2016-05-24 11:37:04 -07:00
Toshio Kuratomi
9ef814e782 Documentation fixes 2016-05-24 10:46:33 -07:00
Toshio Kuratomi
6d18999c6f f 2016-05-24 10:46:10 -07:00
Toshio Kuratomi
7fb0f75db6 Update the Ansiballz developer docs 2016-05-24 10:26:14 -07:00
Robin Roth
0edec45c3d install packages for tests (#15979)
* curl is needed for test_binary_modules
* glibc-i18ndata is needed for postgresql (localedef)
2016-05-24 08:22:34 -07:00
Tim Rupp
9041a0fee9 Adds a general purpose Exception class for F5 modules (#15977)
This class can be used by F5 modules for raising exceptions.
This should be used to handle known errors and raise them so
that they can be printed in the fail_json method.

The common Exception class built-in should not be used because
it hides tracebacks that are necessary to have when debugging
problems with the module.
2016-05-24 11:18:39 -04:00
Adam Chainz
064ed63843 Fix ec2 inventory for potentially inconsistent data (#12642) 2016-05-24 11:00:59 -04:00
Brian Coca
52a0165c77 skip non executable inventory when no shebang (#15969)
alternate fix #15934
2016-05-24 10:25:10 -04:00
Rene Moser
fe05c5e35a cloudstack: add VPC support 2016-05-23 23:01:31 +02:00
Dag Wieers
f9c4fdab40 Move comments out of code-blocks (#15961)
In hindsight, I think it is better to have empty code-blocks
then comment placeholders when people don't replace those sections.
2016-05-23 15:37:17 -04:00
Michael Scherer
cf44db58e0 Add SEQUENCETYPE to handle the dict_keys type (#15953)
On python 3, there is a specific type for dict keys
instead of list, so previous tests based on Sequence didn't
not work anymore.
2016-05-23 15:17:28 -04:00
Brian Coca
c8f0cdbdfd renamed systemd detection function 2016-05-23 15:09:09 -04:00
James Cammarata
733d017ad0 Save and restore the loader's basedir when loading playbooks
Fixes #15930
2016-05-23 15:04:44 -04:00
Brian Coca
6c0b974bde added new modules 2016-05-23 11:31:55 -04:00
Michael Scherer
f9f6f24acd Add a alias for 'long' since python3 do not have it (#15952) 2016-05-23 10:30:06 -04:00
James Cammarata
72b29d122e When adding nested blocks, don't pass in any parent includes
We previously changed block behavior to prefer includes over parent
blocks, which broke inheritence in nested blocks.

Fixes #15926
2016-05-23 10:08:29 -04:00
Sven-Hendrik Haase
070af51370 Update for preferred syntax (#15945) 2016-05-23 09:36:45 -04:00
André Cruz
1fdb7613f1 Fix whitespace. 2016-05-23 10:45:37 +01:00
André Cruz
18831c72f9 Use the python executable specified by the environment. 2016-05-23 10:45:06 +01:00
Michael Schmid
566690a44a Fixes #15915: New HandlerTaskInclude Class which can run TaskIncludes inside Handlers 2016-05-22 15:45:55 +02:00
Toshio Kuratomi
b75895df9b Fix the error handling for loop squashing to restore the name argument into the task args 2016-05-21 07:07:26 -07:00
nitzmahone
a0ff49194e bump submodule refs 2016-05-20 17:29:42 -07:00
Matt Davis
5825958a5a Merge pull request #15275 from Cryptophobia/devel
Update ConfigureRemotingForAnsible.ps1
2016-05-20 17:15:46 -07:00
Matt Clay
0e8930640a Add support for shippable.com CI tests.
This will allow offloading sanity tests from Travis to Shippable.
2016-05-20 14:12:42 -07:00
Brian Coca
dd4c56e4d6 updated diff description to match current diff 2016-05-20 12:44:20 -04:00
John R Barker
1861151fa4 [WIP] Extra test and build dependencies in Docker images (#15692)
* Merge conflicts:

* [skip ci] Revert changes to run_tests.sh

gundalow will update this in a different PR

* [skip ci] Add in ubuntu1604 and opensuseleap

NOTE: We are not configuring anything to use these new images yet.
Therefore no impact on Travis performance

* python-mysql for opensuse

* It's mysql-server on centos6
2016-05-20 07:37:06 -07:00
Victor Costan
8d3da09eae contrib/inventory/ec2.py can read AWS credentials from ec2.ini (#15378) 2016-05-20 09:29:15 -04:00
Brian Coca
f56fc92532 added verbose module path info to changelog 2016-05-20 09:27:29 -04:00
Brian Coca
4821dc66ad now we show path from which we load module on vvv
also added remote module location on debug
2016-05-20 09:25:20 -04:00
Brian Coca
38cca53669 return friendlier error when failing to make dirs 2016-05-20 09:03:01 -04:00
jctanner
5bb4ee0c1e Avoid duplicate system related fact calls. (#15716)
* Avoid duplicate system related fact calls.

Addresses #1461
2016-05-19 22:34:19 -04:00
Toshio Kuratomi
b41b6b2ec5 Update test off make_become for ssh pty race mitigation (#15931) 2016-05-19 15:17:28 -07:00
Toshio Kuratomi
97791f8b4e Update submodule refs 2016-05-19 13:28:36 -07:00
Matt Davis
aee3b2e430 Merge pull request #15919 from camradal/devel
Fix issue with latest pyvmomi and certificate validation
2016-05-19 12:30:12 -07:00
Peter Oliver
95cfceda98 Catch DistributionNotFound when pycrypto is absent (#15731)
* Catch DistributionNotFound when pycrypto is absent

On Solaris 11, module `pkg_resources` throws `DistributionNotFound` on import if `cryptography` is installed but `pycrypto` is not.  This change causes that situation to be handled gracefully.

I'm not using Paramiko or Vault, so I my understanding is that I don't
need `pycrpto`.  I could install `pycrypto` to make the error go away, but:
- The latest released version of `pycrypto` doesn't build cleanly on Solaris (https://github.com/dlitz/pycrypto/issues/184).
- Solaris includes an old version of GMP that triggers warnings every time Ansible runs (https://github.com/ansible/ansible/issues/6941).  I notice that I can silence these warnings with `system_warnings` in `ansible.cfg`, but not installing `pycrypto` seems like a safer solution.

* Ignore only `pkg_resources.DistributionNotFound`, not other exceptions.
2016-05-19 11:39:34 -07:00
Matt Clay
bad293ae35 Add work-around for ssh pty race condition.
This should minimize loss of stdout when using
a pty and connecting with ssh or paramiko_ssh.
2016-05-19 10:33:17 -07:00
René Moser
aa9a054b61 docs: changelog: new module cs_router (#15897) 2016-05-19 10:32:29 +02:00
René Moser
ff62d7bbbd docs: cloudstack: add cloudstack guide to doc fragments (#15898) 2016-05-19 10:31:44 +02:00