Commit graph

8546 commits

Author SHA1 Message Date
Adrian Likins
97ac3f2cc8 Merge pull request #3701 from gillesgagniard/gce-subnetwork-dev
GCE : Add support for subnet networks
2016-06-13 15:33:27 -04:00
Adrian Likins
ec569ac89e Merge pull request #3926 from neowu/devel
fix unarchive doesn't extract changed tar file
2016-06-13 15:31:44 -04:00
Toshio Kuratomi
1d0f408897 Finish python3 syntax compilation fixing for core repo 2016-06-13 12:00:31 -07:00
codemeup @ Work
1e0bb94ced Fixing compile time errors irt (, e => as e, print(), ocat now 0o not 0) exception handling for Python 3 (#3851)
* Fixing compile time errors irt a) exception handling for Python 3 in util, also: b) problem octal usage (fixed) and c) print json_dump -> print(json_dump(xyz) ... et al

* This code was not Python 2.4 compliant. Octal codes and exception handling is now working with Py 2.4, 2.6, & 3.5.

* Fixing formating (or rather reverting an non 2.4 compatible change). Works in compile & runtime checking.

* a) revert to use print sys.stderr not fail_json; b) fixed var name in exception

* Python 3 compatible print (print >>sys.stderr will generate a TypeError - now uses sys.stderr.write instead).
2016-06-13 11:40:13 -07:00
Chris Houseknecht
1a6fd35561 Merge pull request #3944 from chouseknecht/devel
avoid removing attached containers by default
2016-06-13 14:12:35 -04:00
chouseknecht
af8eabe06f Fix #3941 2016-06-13 14:08:20 -04:00
Chris Houseknecht
d6f01d0b4f Merge pull request #3931 from stefanha/docker_service-PyYAML-requirement
docker_service: make PyYAML requirement explicit
2016-06-11 13:14:41 -04:00
Stefan Hajnoczi
8254e2b547 docker_service: make PyYAML requirement explicit
The "Developing Modules" documentation states:

  Include a minimum of dependencies if possible. If there are
  dependencies, document them at the top of the module file, and have
  the module raise JSON error messages when the import fails.

When docker_service runs on a remote host without PyYAML it crashes with
ImportError.

This patch raises a JSON error message when import fails, but only if
the PyYAML module is actually used.  It's only needed when the
"definition" parameter is given.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
2016-06-11 17:29:39 +01:00
Chris Houseknecht
1eb63c7567 Merge pull request #3928 from chouseknecht/fix_16211
Fix #3927 - only stop/kill running containers
2016-06-10 22:59:23 -04:00
chouseknecht
b9b727f435 Fix #16211 - only stop/kill running containers 2016-06-10 22:41:41 -04:00
neo
606598a857 fix unarchive doesn't extract changed tar file #3901 2016-06-10 17:35:08 -04:00
Chris Houseknecht
964d9b3a6d Fix #3906 - Enforce required minimum compose version. (#3925)
* Fix #3906 - Require minimum compose version.

* Fix typo in message text.
2016-06-10 17:26:29 -04:00
Matt Fischer
1f5335d5e0 Update delete notes for Synrhconize docs (#3723)
The example for delete=yes does not specify recursive although it is
required. In addition, the wording for the delete option is confusing
about from where files are really deleted. This should clarify that.
2016-06-10 15:11:24 -04:00
Thomas Quinot
00fb13010c Clarify behaviour when state=present and no name is given (#3904) 2016-06-10 13:03:01 -04:00
Dag Wieers
08f531f92e Update GitHub templates to reflect ansible/ansible (#3900)
* Update GitHub templates to reflect ansible/ansible

Update the GitHub templates to what is used for some time on ansible/ansible
For more information, see ansible/ansible#15961

* Small improvement from ansible/ansible
2016-06-10 11:57:00 -04:00
Dag Wieers
c14d4755e6 Adapt module to use new module._name property (#3918)
This is in line with the change from ansible/ansible#16087
2016-06-10 11:45:49 -04:00
Dag Wieers
3f7a935932 Improve the unzip output scraping (#3819)
* Improve the unzip output scraping

Ensure we capture the complete file (also when it includes spaces).
Drop lines that do not conform (in length) to what we expect (e.g. header/footer).

This fixes #3813

* Fix how split() works
2016-06-10 11:05:22 -04:00
Bradley Phipps
4a8930f886 added missing colons to documentation (#3913) 2016-06-10 09:44:57 -04:00
Toshio Kuratomi
138430f116 Revert "Fix git shallow update (#3794)" -- Broke integration tests:
https://app.shippable.com/runs/57599a7897ae890c00c2898d

This reverts commit c26eb1217f.
2016-06-09 14:48:51 -07:00
jctanner
4a3916bd46 Use the six import for urlsplit instead of importing directly. (#3902)
Fixes https://github.com/ansible/ansible/issues/16191
2016-06-09 13:25:17 -04:00
Robin Roth
c26eb1217f Fix git shallow update (#3794)
* remove unused variables

* fetch branch name instead of HEAD

fix #3782, which was introduced by f1bacc1d3f

* disable git depth option for old git versions

fixes #3782
git support for `--depth` did not fully work in old git versions (before 1.8.2)
fall back to full clones/fetches on those versions
2016-06-09 08:51:02 -07:00
Matt Davis
e2d6b8e288 Merge pull request #3850 from Hypermanzer/utilities_helper_accelerate_p2_p3
Fixing compile time errors irt exception handling for Python 3. This …
2016-06-08 10:15:18 -07:00
Vince v. Oosten
fd418c19c2 move environment variable gathering to end of __init__() (#3890)
* This moves the lines in the code that parse the `env` and `env_file` options for docker to the end of the `__init__()` function.
This is needed because the `_check_capabilites` function needs both a working `self.client` and a proper `self.docker_py_versioninfo`.
`_check_capabilities` is used by `ensure_capabilities` which is, in turn, used by `get_environment`

This means that before this commit, the environment variables could not be loaded because both `self.client` and `self.docker_py_versioninfo` were not set at that time.

This commit fixes that by putting the environment variable parsing after those two.

* This moves the lines in the code that parse the `env` and `env_file` options for docker to the end of the `__init__()` function.
This is needed because the `_check_capabilites` function needs both a working `self.client` and a proper `self.docker_py_versioninfo`.
`_check_capabilities` is used by `ensure_capabilities` which is, in turn, used by `get_environment`

This means that before this commit, the environment variables could not be loaded because both `self.client` and `self.docker_py_versioninfo` were not set at that time.

This commit fixes that by putting the environment variable parsing after those two.
2016-06-08 09:39:34 -04:00
Matt Davis
a8e5f27b2c Iam trust policy (#3885)
* added support for trust policies

* added version_added to new params in DOC string

* update version_added on new iam args to 2.2
2016-06-08 09:23:55 -04:00
Peter Sprygada
0d62a141c3 Merge pull request #3886 from privateip/bugfix-3878
removes requirement for config argument to be specified in junos_facts
2016-06-07 21:46:49 -04:00
Peter Sprygada
e7e295b693 removes requirement for config argument to be specified in junos_facts
The config argument is optional and should not be required.  This
removes the required attribute from the config argument.

fixes #3878
2016-06-07 21:43:17 -04:00
Matt Davis
a8072f9ef0 Merge pull request #3879 from trondhindenes/win_fact_reboot_pending
Return reboot pending as true/false
2016-06-06 14:43:56 -07:00
Trond Hindenes
033dc54d31 Return reboot pending as true/false 2016-06-06 23:32:33 +02:00
mansunkuo
91e9223a76 Add an example to delete Route53 alias record set (#3834) 2016-06-06 22:51:25 +02:00
Brendan Jurd
6448204271 Fix grammar in docs for fetch 'fail_on_missing' (#3872) 2016-06-06 15:27:18 -04:00
Robin Naundorf
9c52f781c9 Fixed Typo in Examples of systemd module (#3870) 2016-06-06 13:50:47 -04:00
Brian Coca
a412451a89 fixed issue with multiline output from systemd
fixes #3868
2016-06-06 09:40:23 -04:00
Mike Mars
5bb8cd7b06 a) fail_json uses kwargs, b) outside the fork, log instead of returning json on stdout. 2016-06-04 17:35:48 -07:00
Mike Mars
5101c2563b data type fix on format string 2016-06-04 16:01:18 -07:00
Mike Mars
6769529bb7 corrected the string formatting (format isn't in 2.4 and even in some later versions of python 2.x requires an index). Tested for both compile ***& runtime exceptions*** against 2.4, 2.6, and 3.5. 2016-06-04 15:26:32 -07:00
Toshio Kuratomi
cb1093e085 Fix the six import 2016-06-04 10:49:13 -07:00
Toshio Kuratomi
469169f654 Be sure to import urllib.parse from somewhere 2016-06-04 08:49:24 -07:00
Chris Houseknecht
7d64264bcb Merge pull request #3867 from chouseknecht/devel
Fix issue #3866
2016-06-04 02:12:20 -04:00
chouseknecht
68151790c2
Fix issue #3866 2016-06-04 02:07:10 -04:00
Mike Mars
a76083d439 Missed umask octal conversion. 2016-06-03 15:07:52 -07:00
Mike Mars
529e75f981 Corrected string of text... 2016-06-03 15:02:55 -07:00
Mike Mars
82017ce298 1) Modified error handling to work with Python 2.4.
2) Fixed octal codes to fall in line with the ansible guide, "Porting Modules to Python 3"
3) updated the requirements.
All changes have been verified against Python 2.4, 2.6, & 3.5.
2016-06-03 11:40:02 -07:00
nitzmahone
2bd8d78a8b correct gs_storage docs to match reality 2016-06-03 10:42:51 -07:00
Ryan Brown
878cdb10f9 Merge pull request #3847 from washingtoneg/postgres9.5-rds-param-group-support
Add support for PostgreSQL 9.5 in rds_param_group (fix for #3846)
2016-06-03 13:37:34 -04:00
Ryan Brown
f54e39450c Merge pull request #2555 from jsternberg/paginate-iam-results
Paginate the results from `boto.iam`
2016-06-03 13:26:55 -04:00
Matt Davis
c1f802137b Merge pull request #3345 from mpappas86/bugfix/ec2groupCheckMode
Prevent ec2group from deleting sgs during check_mode runs
2016-06-03 08:54:09 -07:00
Michael Pappas
d26bb2eb41 Prevent ec2group from deleting sgs during check_mode runs 2016-06-03 10:58:56 -04:00
Toshio Kuratomi
c1bb97b528 Remove rackspace modules from travis py3 blacklist as they should now compile 2016-06-03 06:59:15 -07:00
codemeup @ Work
a51a896d20 Fixing Rackspace compile time errors irt exception handling for Python 3 (#3849) 2016-06-03 06:39:58 -07:00
codemeup @ Work
18455b2e72 Fixing open stack compile time errors irt exception handling for Python 3 (#3848) 2016-06-03 06:37:09 -07:00