cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7317 commits 47 branches 390 tags 440 MiB
Commit graph

223 commits

Author SHA1 Message Date
Toshio Kuratomi
750aa16a06 Merge pull request #2093 from zfil/fix_facts 
docker module: fix regressions introduced by f38186c and 80aca4b
 2015-11-06 10:20:20 -08:00
Toshio Kuratomi
e318be30ff Fix issues version_added and chaged => changed typo 2015-11-02 10:49:24 -08:00
Michael Schuett
80c2e28a48 Fix message 
Previous fix did not actual work. This fix does however.
 2015-11-02 10:49:24 -08:00
Michael Schuett
b0357bf9e8 Handle connection error 
Try and help when mac hits a connection error.
 2015-11-02 10:49:24 -08:00
Michael Schuett
1dcb31cad6 remove .geturl() 
Can't call geturl on a string.
 2015-11-02 10:49:24 -08:00
Michael Schuett
c126498899 Remove faulty logic 
Update logic after splitting the error into two separate messages.
 2015-11-02 10:49:24 -08:00
Michael Schuett
1e8d20b0da Documentation Fix 
Updated documentation to match current module state.
 2015-11-02 10:49:24 -08:00
Michael Schuett
0a5b7087bd Improve Message 
Give user a course of action in the case where the suggestions do not
work. This will hopefully allow us to work through any further issues
much faster.
 2015-11-02 10:49:24 -08:00
Michael Schuett
addbc329be Improve Error Reporting 
This will hopefully help mac users be able to quickly resolve any issues
they may find when trying to use this module.
 2015-11-02 10:49:24 -08:00
Michael Schuett
bf5929d32a docker_image TLS 
Check commit enables using tls when using the docker_image module. It
also removes the default for docker_url which doesn't allow us to check
for DOCKER_HOST which is a more sane default. This allows you to use
docker_image on OSX but more documentation is needed.
 2015-11-02 10:49:24 -08:00
Brian Coca
4c14e6267f Merge pull request #2258 from SamYaple/fix_docker_bug_2257 
Don't assume ExposedPorts exists (bug #2257)
 2015-10-14 11:31:06 -04:00
Adam Williamson
64b8596250 fix #2043: strip empty dict from end of 'pull' stream 
When pulling an image using Docker 1.8, it seems the output
JSON stream has an empty dict at the very end. This causes
ansible to fail when pulling an image, as it's expecting a
status message in that dict which it uses to determine whether
it had to download the image or not. As a bit of an ugly hack
for that which remains backward compatible, try the last item
in the stream, and if it's an empty dict, take the last-but-one
item instead.

The strip() is needed as the exact value appears to be '{}/r/n';
we could just match that, but it seems like the kind of thing
where maybe it'd happen to just be '{}/n' or '{}' or something
in some cases, so let's just use strip() in case.
 2015-10-13 22:33:46 -07:00
Sam Yaple
f15d285514 Catch the second occurance of ExposedPorts as well 2015-10-13 10:34:08 +00:00
Sam Yaple
9db5ac8e45 Don't assume ExposedPorts exists (bug #2257) 
A recent change [1] in docker between v1.8.2 and v1.8.3 changed what
is returned in the json when inspecting an image. Five variables which
could have been expected before will now be omited when empty. Only
one of those variables is being addressed in the docker, ExposedPorts.

Unfortunately there was also no API version change on this so this
can't be easily corrected with pinning the API to the older version.

This does a get() which will return None if the variable is not in the
dict formed from the json that was returned. Everything else works the
same way.

[1] 9098628b29
 2015-10-13 10:24:36 +00:00
Brian Coca
da1a317f7d Merge pull request #2139 from justnom/devel 
Adding additional Docker log drivers.
 2015-10-12 18:45:55 -04:00
Colin Hutchinson
f7aa6c4d27 make a text link into a actual hyperlink 
the text link doesn't fit on some screen resolutions. Making it into sphinx hyperlink will solve that
 2015-10-03 21:50:15 -04:00
justnom
518ac36878 Adding additional Docker log drivers. 
Adding additional `log_driver` choices:
* journald
* gelf
* fluentd

Compatible with Docker version >= 1.8.0
 2015-09-23 11:54:51 -04:00
Philippe Jandot
8052d49b07 fix regression introduced by f38186ce8b, and propose a fix for docker facts 2015-09-16 16:49:09 +02:00
David Dyball
a0a374b8ca Updated PR based on comments 2015-09-08 16:19:26 +01:00
Toshio Kuratomi
6e5a832dc2 Fix read-only usage to depend on the docker-py and docker server version 2015-09-04 15:59:19 -07:00
Toshio Kuratomi
1f358f349b We had two separate methods trying to do the same thing but neither one was complete. This merges them so that all of the options get parsed and applied. 2015-09-03 15:39:18 -07:00
Omri Iluz
daf7a0551b No need for .keys on volumes list 
Since c3f92cca21 changed "volumes" to be a list instead of a dictionary, we don't need (and cannot) .keys when appending to set.
Reported as bug #1957
 2015-08-23 02:29:39 -07:00
Ilya Epifanov
d951172920 fixed memory_limit for docker api version >= 1.19 2015-08-16 18:34:56 +03:00
sebi
599d60efc0 mem_limit client version check 2015-08-06 16:46:01 +03:00
Toshio Kuratomi
1001eae3c8 Set a default value for DEFAULT_DOCKER_API_VERSION so we can create the AnsibleModule without docker-py 2015-08-03 08:44:48 -07:00
Brian Coca
c6da9d0758 added missing version_Added to extra_hosts 
fixes #1843
 2015-07-30 13:05:00 -04:00
Toshio Kuratomi
2785364ebe Merge pull request #1736 from larsks/bug/docker-version-parse 
docker: fix parsing of docker __version__ string
 2015-07-29 12:36:37 -07:00
Brian Coca
49400d90ac Merge pull request #1830 from ecliptik/devel 
Fix incorrect var name for api_version
 2015-07-28 18:25:20 -04:00
Micheal Waltz
b43f236b05 Fix incorrect var name for api_version 2015-07-28 15:11:33 -07:00
Brian Coca
dbdbcb33cc defined DEFAULT_DOCKER_API_VERSION to avoid it erroring out before we send the message that docker.py is missing 2015-07-27 22:33:15 -04:00
Brian Coca
44d23ababd Merge pull request #1767 from ecliptik/devel 
Use proper HostConfig element which contains the proper Memory value …
 2015-07-27 18:23:33 -04:00
Brian Coca
d91834bdf5 Merge pull request #1763 from larsks/bug/missing-mem-limit 
restore mem_limit
 2015-07-27 18:22:37 -04:00
Micheal Waltz
613fe54908 Use a if/else instead to avoid loading possibly invalid values for Memory 2015-07-23 12:17:26 -07:00
Micheal Waltz
77d1c896fe Set the API version when checking differences in containers and use 
this to determine the location of the Memory value depending on the version used.

In v1.18 and earlier it was ['Config']['Memory'], but in v1.19 it
changed to ['HostConfig']['Memory'].
 2015-07-23 11:34:33 -07:00
Johan Haals
1ea03e7182 ensures API compatibility for read_only containers 2015-07-23 16:45:01 +02:00
Johan Haals
851e55b55f changed version_added for read_only param 
this feature will be released in 2.0
 2015-07-22 08:28:16 +02:00
Johan Haals
8ec6538ad4 Merge remote-tracking branch 'upstream/devel' into docker-read-only-container 2015-07-22 08:27:35 +02:00
Christian Hammerl
b96d304b93 docker: add support to add/drop capabilities 2015-07-21 19:34:24 -04:00
Micheal Waltz
b0b1566b89 Use proper HostConfig element which contians the proper Memory value - fixes #1766 2015-07-21 12:58:58 -07:00
Lars Kellogg-Stedman
6aedc1020e restore mem_limit 
mem_limit got lost in the #1744; this restores it.  Thanks to @dgromov
for the report.
 2015-07-21 11:52:48 -04:00
Johan Haals
38f01b52e8 Added support for --read-only Docker containers 
Adds support for mounting the container's root filesystem as read only.
 2015-07-21 14:24:07 +02:00
Brian Coca
88167a5dac minor doc fixes to docker_user 2015-07-20 21:18:49 -04:00
Brian Coca
5240124525 Merge pull request #361 from simono/docker-add-user 
Add option docker_user for docker module.
 2015-07-20 21:17:42 -04:00
Brian Coca
030d6d645c added version_Added for new signal option in docker module 2015-07-20 20:53:59 -04:00
Brian Coca
ac28f16126 Merge pull request #1014 from nemunaire/docker-kill-signal 
[Docker] Add signal parameter when killing container
 2015-07-20 20:52:49 -04:00
Brian Coca
2441928484 corrected v ersion added 2015-07-20 20:09:36 -04:00
Daniel Kerwin
d4d78a1998 Too late for 1.8 2015-07-20 21:50:25 +02:00
Daniel Kerwin
a702dbd29a Switch to _cap_ver_req and add cpu_set to create_containers 2015-07-20 21:50:24 +02:00
Daniel Kerwin
a8bc50a11f Renamed to cpu_set 2015-07-20 21:48:39 +02:00
Daniel Kerwin
fca75a9705 Add support for cpusets. Requires docker-py >= 0.6.0 2015-07-20 21:48:39 +02:00