Commit graph

8932 commits

Author SHA1 Message Date
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
Rodríguez, Jorge
7d33c6ccdf Do not forcibly push when building, either. 2016-06-08 11:45:39 +03:00
Rodríguez, Jorge
a0be466f90 Don't forcibly push loaded images to registry. Fixes #3763 2016-06-08 11:43:27 +03: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
Ryan S. Brown
1b9e28cc68 IAM group modules need module passed
The IAM group modules were not receiving the `module` object, but they
use `module.fail_json()` in their exception handlers. This patch passes
through the module object so the real errors from boto are exposed,
rather than errors about "NoneType has no method `fail_json`".
2016-06-03 13:15:15 -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
codemeup @ Work
d0a955452a Fixing gce compile time errors irt exception handling for Python 3 (#3845) 2016-06-03 06:35:34 -07:00
Chris Houseknecht
100cc644a3 Merge pull request #3859 from chouseknecht/devel
Fix 3857 name regex
2016-06-03 08:05:12 -04:00
chouseknecht
1a3e277f95
Fix 3857 name regex 2016-06-03 07:53:55 -04:00
Chris Houseknecht
b774a60ac0 Merge pull request #3856 from chouseknecht/devel
Fix #147 automatically expose published ports
2016-06-03 06:39:59 -04:00
chouseknecht
d43a91c627 Fix #147 automatically expose published ports 2016-06-03 05:25:11 -04:00
Chris Houseknecht
8aca572413 Merge pull request #3853 from chouseknecht/devel
Remove unused method in ContainerManager
2016-06-03 04:19:30 -04:00
chouseknecht
67432709a4
Remove unused method in ContainerManager 2016-06-03 02:10:59 -04:00
Chris Houseknecht
0a42ada42a Merge pull request #3844 from Hypermanzer/docker-python-3-compat-bug
Fixing Docker compile time errors irt exception handling for Python 3
2016-06-03 02:05:09 -04:00
Chris Houseknecht
93c8d923c4 Merge pull request #3837 from chouseknecht/devel
Fix #3822 stop container
2016-06-03 02:03:28 -04:00
chouseknecht
09fe0416b6 Fix #3822 stop container 2016-06-03 01:54:39 -04:00
Jonathan A. Sternberg
969471f2ab Paginate the results from boto.iam
The default pagination is every 100 items with a maximum of 1000 from
Amazon. This properly uses the marker returned by Amazon to concatenate
the various pages from the results.

This fixes #2440.
2016-06-02 22:30:40 -05:00
Toshio Kuratomi
d379dbad50 Digitalocean no longer needs to be on the python3 blacklist 2016-06-02 16:13:16 -07:00
Mike Mars
aa44ef55e7 Fixing compile time errors irt exception handling for Python 3. This particular diff fixes problems with Exception handling and the use/misues IRT Python 3 of octal numbers (InvalidToken exceptions). 2016-06-02 15:58:01 -07:00
Elena Washington
e1d7d78fcc Add support for PostgreSQL 9.5 in rds_param_group (fix for #3846) 2016-06-02 18:07:00 -04:00
codemeup @ Work
27ad29d376 Fixing compile time error exception handling for python 3. (#3843) 2016-06-02 14:51:35 -07:00
Mike Mars
1c63fb754d Fixing Docker compile time errors irt exception handling for Python 3 2016-06-02 14:30:35 -07:00
Toshio Kuratomi
cc28e56666 Remove modules from py3 blacklist that now compile with PY3 2016-06-02 13:01:54 -07:00
codemeup @ Work
9ceef9cc52 Fixing compile time errors irt exception handling for Python 3 (#3841)
* Fixing error exception handling for python. Does not need to be compatible with Python2.4 b/c boto is Python 2.6 and above.

* Fixing error exception handling for python. Does not need to be compatible with Python2.4 b/c boto is Python 2.6 and above.
2016-06-02 13:00:04 -07:00