Commit graph

2655 commits

Author SHA1 Message Date
Adam Butler
1c41b6fdb2 Fixes incorrect key name protocols -> protocol (#3963) 2016-06-16 10:04:05 -04:00
Hagen Kuehn
a5fdd8c128 fixed unknown type <type 'list'> error (#3959) 2016-06-15 14:26:00 -04:00
Chris Houseknecht
0802569af9 Merge pull request #3894 from stefanha/docker_image-load_image-streaming
Stream image data in load_image() to avoid out-of-memory
2016-06-14 01:10:26 -04:00
Chris Houseknecht
0098dc322f Merge pull request #3535 from picpicpic/devel
fixes dns type in docker module
2016-06-13 18:28:18 -04:00
chouseknecht
d988187860
Remove dns from container create parameters. 2016-06-13 18:06:20 -04:00
chouseknecht
0884a942bf Fix #3945 docker_container detach not waiting on container to execute. 2016-06-13 16:30:21 -04:00
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
Toshio Kuratomi
1d0f408897 Finish python3 syntax compilation fixing for core repo 2016-06-13 12:00:31 -07:00
chouseknecht
af8eabe06f Fix #3941 2016-06-13 14:08:20 -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
chouseknecht
b9b727f435 Fix #16211 - only stop/kill running containers 2016-06-10 22:41:41 -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
Bradley Phipps
4a8930f886 added missing colons to documentation (#3913) 2016-06-10 09:44:57 -04:00
Stefan Hajnoczi
47cc422b8a Stream image data in load_image() to avoid out-of-memory
Reading the entire tar file into memory can result in out-of-memory
conditions such as this traceback:

Traceback (most recent call last):
  File "/tmp/ansible_YELTSu/ansible_module_docker_image.py", line 486, in load_image
    self.client.load_image(image_data)
  File "/usr/local/lib/python2.7/dist-packages/docker/api/image.py", line 147, in load_image
    res = self._post(self._url("/images/load"), data=data)
  ...
  File "/usr/lib/python2.7/httplib.py", line 997, in endheaders
    self._send_output(message_body)
  File "/usr/lib/python2.7/httplib.py", line 848, in _send_output
    msg += message_body
MemoryError

Luckily docker-py's load_image(), which calls requests post(), accepts a
file-like object instead of a string.  Pass in the file object to avoid
reading the full file into memory.  This allows larger tar files to load
succesfully.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
2016-06-08 23:50:44 +01: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
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