Commit graph

2693 commits

Author SHA1 Message Date
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
mansunkuo
91e9223a76 Add an example to delete Route53 alias record set (#3834) 2016-06-06 22:51:25 +02:00
chouseknecht
68151790c2
Fix issue #3866 2016-06-04 02:07:10 -04: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
Michael Pappas
d26bb2eb41 Prevent ec2group from deleting sgs during check_mode runs 2016-06-03 10:58:56 -04: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
chouseknecht
1a3e277f95
Fix 3857 name regex 2016-06-03 07:53:55 -04:00
chouseknecht
d43a91c627 Fix #147 automatically expose published ports 2016-06-03 05:25:11 -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
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
codemeup @ Work
7314cc3867 Fixing error exception handling for python3. Does not need to be compa… (#3840)
* 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.

* Fixing compile time errors IRT error exception handling for Python 3.5.
This does not need to be compatible with Python2.4 b/c Boto is Python 2.6 and above.
2016-06-02 12:56:48 -07:00
codemeup @ Work
5b1ab46265 Fixing error exception handling for python. Does not need to be compatible with Python2.4 b/c boto is Python 2.6 and above. (#3839) 2016-06-02 11:20:04 -07:00
chouseknecht
a676d9e126 Remove registery option per #3824. 2016-06-02 11:43:36 -04:00
chouseknecht
4ded9313b7 Fix upate typo and expected volume compare. 2016-06-02 06:14:29 -04:00
Chris Houseknecht
b5e93b51cf Merge pull request #3828 from chouseknecht/winggundamth-devel
Fix volume to support not binding volumes to host
2016-06-01 19:05:01 -04:00
chouseknecht
e2d8d9d09a Fixed binds and volumes. Now recognizes bound vs unbound as well as named volumes. 2016-06-01 17:05:03 -04:00
chouseknecht
de15a631ad Fix missing ansible_facts. 2016-06-01 12:34:02 -04:00
Jirayut 'Dear' Nimsaeng
1212e2ed25 Fix volume to support not binding volumes to host 2016-06-01 17:26:51 +07:00
Anton Simernia
d30040f9dc Update gc_storage.py (#3802) 2016-05-31 12:27:18 -04:00
Chris Houseknecht
bf6bf9e68f Merge pull request #3796 from chouseknecht/fix_3766
Fix 3766
2016-05-31 10:45:27 -04:00
chouseknecht
e8db7fd8cc
Remove debug/register from examples. 2016-05-31 10:33:43 -04:00
chouseknecht
0601df8c70
Fix network comparison. Fix handling of links. Updated doc strings. Added more examples. 2016-05-31 10:14:42 -04:00
David Shrewsbury
d952087557 Merge pull request #3732 from GheRivero/devel
Make add ip_floating_ip idempotent
2016-05-31 08:38:45 -04:00
chouseknecht
d9c751be16
Set version added to 2.2 so that tests pass 2016-05-30 18:48:42 -04:00
chouseknecht
78019e4388
For new options move vesion_added to 2.1.1 2016-05-30 18:39:52 -04:00
chouseknecht
633e11be1e
Fixed bug in _get_network_id 2016-05-30 18:37:28 -04:00
chouseknecht
6d9de1b5a1 Fix doc strings. 2016-05-30 15:14:14 -04:00
chouseknecht
3292121e6d
Fixed issues post testing. 2016-05-30 15:04:43 -04:00
chouseknecht
8cd028bd8e First pass at implementing networks parameter. Also added purge_networks option to remove container from networks not included in networks param. 2016-05-30 12:03:11 -04:00
chouseknecht
23816c9c04 Fix for 3768 - adding support for env_file 2016-05-29 10:27:07 -04:00
Chris Houseknecht
4d8f7d161b Merge pull request #3776 from danschmidt5189/fix-docker_container-typo
Fix "ansbile_facts" typo in docker_container module
2016-05-29 09:42:04 -04:00
chouseknecht
cba5b37c9f
Check self.parameters.env exists. 2016-05-29 09:36:17 -04:00
chouseknecht
c419d351c5 Fix for issue #3775 - env config comparison 2016-05-29 09:32:52 -04:00
chouseknecht
651133469c
Update restart_policy doc strings. 2016-05-29 08:29:52 -04:00
chouseknecht
6aa4feb459
Fix restart_poicy 2016-05-29 08:20:59 -04:00
Chris Houseknecht
9a1387f255 Merge pull request #3784 from chouseknecht/fix_3783
Fix for #3783 - command returns not found or does not exist.
2016-05-29 07:18:09 -04:00
chouseknecht
af0aa8247d
Fix for #3783 - command returns not found or does not exist. 2016-05-29 06:54:46 -04:00
pic
fee0055f9f fix #3528 : dns type 2016-05-28 12:41:21 +02:00
Dan Schmidt
31d21efbc5 Fix "ansbile_facts" typo in docker_container module 2016-05-28 00:33:03 -07:00
Chris Houseknecht
90e8a36d4c Merge pull request #3347 from dougluce/fix-s3-region-error
Fix S3 unavailable region error
2016-05-27 13:41:29 -04:00
David Fischer
d8ad80ae0f Add MariaDB to valid RDS engines (#3337)
* Add MariaDB to valid RDS engines

* Update RDS module documentation
2016-05-27 11:49:42 +02:00
chouseknecht
97f16b52cf
Fix missing key error when updating existing virtual network. 2016-05-26 11:48:58 -04:00
Chris Houseknecht
ddb0b53c66 Merge pull request #3745 from chouseknecht/fix_3740
Fix for issue 3740. Make docker_service more resilient when targeting…
2016-05-26 11:46:41 -04:00
Roberto Bampi
423209d187 Add an example for SRV record in route53 (#3749) 2016-05-26 10:45:02 -04:00
chouseknecht
904d947172 Fix for issue 3740. Make docker_service more resilient when targeting older API versions. 2016-05-25 16:38:38 -04:00
Brian Coca
d8b67bdeb0 deprecated docker (#3710)
* deprecated docker

* updated formatting
2016-05-25 15:08:45 -04:00
Alvaro Aleman
7f7b9054fd Fix can_update test in os_subnet (#3664) 2016-05-25 08:52:51 +02:00
René Moser
215da19511 Add no_gateway_ip option to os_subnet module (#3736)
no_gateway_ip option can provide subnet that is not having a gateway.
fixes #1880
2016-05-25 08:42:11 +02:00
Doug Luce
ec0f2113e0 Fix S3 unavailable region error
This is to address this error:

  fatal: [site]: FAILED! => {"changed": false, "failed": true, "msg": "Failed to connect to S3: Region  does not seem to be available for awsmodule boto.s3. If the region definitely exists, you may need to upgrade boto or extend with endpoints_path"}

Commit 0dd58e9 changed the logic so an exception is thrown (by
`connect_to_aws`) before the `s3 is None` check is performed. This
changes the `None` check to a catch so the old logic can compensate.
2016-05-24 20:37:12 -07:00
Ghe Rivero
c5430d0f92 Make add ip_floating_ip idempotent
Closes issue #1858
2016-05-25 00:36:28 +02:00
Ryan Brown
aa995806b9 Merge pull request #3320 from hyperized/patch-1
Added restart functionality to ec2.py
2016-05-24 10:49:16 -04:00
Michael Scherer
b78d708678 Port vsphere_guest to py3/py2.4 syntax (#3721) 2016-05-23 09:36:24 -04:00
Kenny Woodson
5474da09bc Unindenting the delete to user (#3147) 2016-05-20 10:26:19 -04:00
Ryan Brown
58bb2fc4f6 Allow users to pick AWS Aurora as an RDS engine (#3414)
Per the [RDS docs](http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html),
add `aurora` as a valid DB engine.
2016-05-20 10:25:27 -04:00
Nathan Brown
97f6daa854 Do not expect the elb to have policies or instances. Fixes #3593 (#3595) 2016-05-20 09:47:13 -04:00
kwerey
1bfc33728b Add option to make RDS param groups for the MySQL 5.7 engine family. (#3695) 2016-05-20 09:45:11 -04:00
Gilles Gagniard
8231a1afc8 better error message if libcloud is not recent enough to use gce subnetworks 2016-05-20 03:53:27 -04:00
Lloyd Hazlett
3cf40d9596 Add path type to argument_spec where applicable (#3040) 2016-05-20 07:36:40 +02:00
Matt Martz
1d87213de1 2 Module fixes (#3611)
* Fix syntax error in azure_rm_virtualmachine.py

* Allow rhn_register to fail gracefully when rhn-client-tools is not installed
2016-05-20 07:35:43 +02:00
Toshio Kuratomi
521370459c Py3 exclude list (#3698)
* Fix a few modules to pass syntax checks under python3

* Move from a whitelist of modules to check for python3 compat to a blacklist
2016-05-19 15:34:59 -07:00
Cheuk Lam
d3097bf580 Added support for accepting extra config options in vm reconfiguration. (#3327) 2016-05-19 17:13:00 +02:00
chouseknecht
a8bf8260aa
Fixed the URL in description. It's now valid Yaml. 2016-05-19 10:00:21 -04:00
chouseknecht
3d43ccae1e
Remove the U(). 2016-05-19 09:41:11 -04:00
Gilles Gagniard
c859a9d339 fix documentation to reflect subnetwork option is new in ansible 2.2 2016-05-19 06:21:28 -04:00
Gilles Gagniard
2a008998fd Initial support for specifying in which subnetwork a gce instance should be created. This is required for non-legacy networks. 2016-05-19 03:53:49 -04:00
chouseknecht
fe45ec9d9e
Uppercase 2016-05-18 15:03:10 -04:00
chouseknecht
10ee35ff26
Make the new bits a NOTE 2016-05-18 14:35:20 -04:00
chouseknecht
1825a73c40
Where to get the full docker picture. 2016-05-18 13:34:13 -04:00
Kaz Cheng
f87f0ec277 Allow create_iam_role to return an additional value of role_result and (#2418)
instance_profile_result, in addition to the existing role list and change value
2016-05-18 09:06:11 -04:00
Shubham
64b104ac37 remove module argument, fix #3682 (#3683) 2016-05-17 14:36:05 -04:00
Matt Martz
9b6a7eb4f9 Revert "Fix doc strings spacing."
This reverts commit 127d518011.
2016-05-15 17:43:28 -05:00
chouseknecht
127d518011
Fix doc strings spacing. 2016-05-14 09:34:15 -04:00
chouseknecht
a81d0a6809
Fix doc strings. Missing requirements and doc fragment reference. 2016-05-14 09:13:47 -04:00
Toshio Kuratomi
298fd0ae56 Docs fixes 2016-05-13 11:01:19 -07:00
chouseknecht
d63bc38481
Fail gracefully when build path is not found. 2016-05-13 00:30:36 -04:00
chouseknecht
3a5dd00076
Fixed files/project_files naming. Correct name is files. 2016-05-12 05:31:10 -04:00
chouseknecht
22853efeed
Flip version added back to 2.2 to make tests pass. 2016-05-12 05:04:21 -04:00
chouseknecht
834d2fb9fe
Moving version added to 2.1 2016-05-12 04:44:35 -04:00
chouseknecht
282b2d45df
Added actions to RETURN docs. Show actions when debug or check mode. 2016-05-12 04:42:50 -04:00
chouseknecht
c2d2189274
Removed use of --diff. Replaced 'diff' in output with 'actions'. Only show 'actions' in output if debug true. 2016-05-11 15:01:29 -04:00
chouseknecht
f69b352341 Removed fail method. Combined recreate and force_recreate params. 2016-05-11 13:50:55 -04:00
chouseknecht
d9b026dcef Adding docker_service 2016-05-11 13:50:55 -04:00
Chris Houseknecht
f08e5608c7 Fixed parameters passing in container_create method. (#3618) 2016-05-10 17:56:57 -04:00
Brian Coca
c3ee04b842 switched to return facts 2016-05-04 08:43:11 -04:00
Brian Coca
e7d49f3308 fixed documentation and arg issues 2016-05-04 08:37:23 -04:00
hyperized
507d083d08 Added restart functionality to ec2.py 2016-05-04 09:12:02 +02:00
Toshio Kuratomi
9db1233521 Fix documentation 2016-05-03 10:10:51 -07:00