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

125 commits

Author SHA1 Message Date
Toshio Kuratomi
76198a8223 Merge pull request #961 from nemunaire/fix-docker-version-print 
[docker] Fix formating error when remote host doesn't have required version
 2015-03-18 19:51:45 -07:00
Toshio Kuratomi
e338fef730 Add another valid status from downloading images 2015-03-18 18:27:01 -07:00
nemunaire
fce8c21176 Convert tuple items to string before format 2015-03-18 14:37:26 +01:00
Toshio Kuratomi
8658b82de7 Some code cleanup (removed unused variables and imports) 2015-03-16 11:58:03 -07:00
Toshio Kuratomi
34c4e0d495 Also use DOCKER_TLS_VERIFY env var to turn on tls verification 2015-03-16 11:43:52 -07:00
Toshio Kuratomi
ceda82603a Merge pull request #947 from ansible/docker-tls-none 
When no use_tls is not specified and no tls parameters are given we need to not attempt tls.
 2015-03-16 11:29:14 -07:00
Toshio Kuratomi
b0d194ea94 Fix a potential bug in docker pull 2015-03-15 11:22:07 -07:00
Toshio Kuratomi
5b4d7a2182 When no use_tls is not specified and no tls parameters are given we need to not attempt tls. 2015-03-14 22:59:17 -07:00
Toshio Kuratomi
45637176dc Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from 
Remove volumes_from altogether

Conflicts:
	cloud/docker/docker.py
 2015-03-13 13:42:40 -07:00
Toshio Kuratomi
e4a5b46cfb Merge pull request #936 from ansible/docker-pid-mode 
Make pid_mode parameter do minimum docker-py/docker server version checks
 2015-03-13 11:50:46 -07:00
Toshio Kuratomi
81fc92bd66 Make state=running work for backwards compatibility with 1.8 2015-03-13 10:23:10 -07:00
Toshio Kuratomi
bddd02bfcb Fix lookup of parameter name to be pid instead of pid_mode 2015-03-13 07:31:55 -07:00
Toshio Kuratomi
9d0d54b9a6 Merge pull request #926 from ansible/docker-tls-alt-854 
Alternative implementation of tls for docker
 2015-03-12 23:41:28 -07:00
Toshio Kuratomi
cf9374f3ea Make pid_mode parameter do minimum docker-py/docker server version checks 2015-03-12 22:53:31 -07:00
Toshio Kuratomi
3a6cc86578 Fix for problems found by @dguerri 
* TLSConfig['verify'] has to be set to False if we're only encrypting the
  connection, not verifying the host.
* tls_hostname was not set if tls_ca_cert was not present

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78573877
 2015-03-12 12:53:48 -07:00
Toshio Kuratomi
1add8ed9e5 Implement comments from @smashwilson: 
* if tls_ca_cert is set then use tls to verify the server
* take tls_hostname from the environment variable DOCKER_TLS_HOSTNAME
  if it's not specified in the playbook

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78542210
 2015-03-12 11:07:22 -07:00
Ian Babrou
763f472f5b fixed: global name 'e' is not defined 2015-03-12 11:04:50 +03:00
Toshio Kuratomi
3e0cbc82f1 Alternative implementation of tls for docker 
Alternative to #854
 2015-03-11 20:37:27 -07:00
Toshio Kuratomi
ca32205c7b Documentation style changes 2015-03-11 08:26:16 -07:00
Ian Babrou
9ecfde7551 not triggering reload for links and not string env variables 2015-03-09 22:49:00 +03:00
Ash Wilson
0969fd75c8 Use {0}, {1} style format indices for 2.6 compat 2015-03-09 12:54:22 -04:00
Ash Wilson
19664a96db Expect module env vars to override Dockerfile ones. 2015-03-09 12:17:39 -04:00
Ash Wilson
608ddbea29 Include bind mounts in VOLUMES check. 2015-03-09 11:20:14 -04:00
Ash Wilson
2c58eb3845 Exposed ports, env vars, volumes from the image. 
This will account for settings that are provided by the hierarchy of
Dockerfiles used to construct your image, rather than only accounting
for settings provided to the module directly.
 2015-03-09 10:32:10 -04:00
Ash Wilson
79db475316 Full image inspection and just repo tags 
Hat tip to @bobrik.
 2015-03-09 10:05:56 -04:00
Brian Coca
1c0623ab8d Merge pull request #890 from SamYaple/docker-pid-support 
Add pid mode support to docker module
 2015-03-07 20:27:42 -05:00
Ash Wilson
d046425049 Connect to Docker with optional TLS. 2015-03-06 18:04:36 -05:00
Ash Wilson
80aca4b936 Rework docker module states. 
Organize each state into a distinct function for readability and composability.
Rework `present` to create but not start containers. Add a `restarted` state
to unconditionally restart a container and a `reloaded` state to restart a
container if and only if its configuration is incorrect. Store our most recent
knowledge about container states in a ContainerSet object. Improve the value
registered by this task to include not only the inspect data from any changed
containers, but also action counters in their native form, a summary message
for all actions taken, and a `reload_reasons` key to store a human-readable
diagnostic to determine why each container was reloaded.
 2015-03-06 17:58:11 -05:00
Ash Wilson
7490223940 Pull newer image versions when requested. 2015-03-06 17:56:45 -05:00
Ash Wilson
fedbea682e Another documentation commit. 2015-03-06 17:56:37 -05:00
Sam Yaple
e1e74bdf33 Updated version and fixed default 2015-03-06 03:13:55 -06:00
Sam Yaple
74e922449b Add pid mode support to docker module 
This allows setting the pid namespace for a container. Currently only
the 'host' pid namespace is supported.

This requires Docker 1.4.1 and docker-py 1.0.0
 2015-03-03 23:32:15 -06:00
Brian Coca
d2158708ff undeprecated docker_image until replacement actually arives 2015-02-23 12:43:10 -05:00
Brian Coca
b787792908 Merge pull request #679 from marqc/fix_dns_create_container_issue 
Fixes docker.errors.DockerException: 'dns' parameter has no effect on create_container()...
 2015-02-18 15:44:16 -05:00
Brian Coca
7e71121da5 Merge pull request #730 from SergeyZh/devel 
Fixed broken volumes_from for client API >= 1.10
 2015-02-17 11:49:16 -05:00
Tomer Paz
374dd06c8e resolve issue 764 
https://github.com/ansible/ansible-modules-core/issues/764
added 'domainname' attribute in addition to existing 'hostname'.
That's the most elegant way to delegate domain name to docker-py...
 2015-02-11 09:25:24 +02:00
Sergey Zhukov
7baaf97a8b Fixed broken volumes_from for client API >= 1.10 2015-01-30 19:58:12 +03:00
Toshio Kuratomi
670098af2d Spelling and grammar fix 2015-01-22 23:08:24 -08:00
calmera
d2c6791082 Update docker.py 
Added some more documentation for the memory_limit and volume options.
 2015-01-22 23:08:24 -08:00
Brian Coca
d66c3fcf51 moved defaulting to module constant to after when it is defined 2015-01-21 19:50:34 -05:00
Marek Chodor
13685fb91b Fixes docker.errors.DockerException: 'dns' parameter has no effect on create_container(). It has been moved to start() 2015-01-21 13:37:24 +01:00
Lorin Hochstein
48ce8bb564 Don't pass volumes_from to create_container 
Don't pass the volumes_from argument to the Docker create_container method.

If the volumes_from argument is passed to the create_container method, Docker
raises the following exception:

    docker.errors.DockerException: 'volumes_from' parameter has no effect on
    create_container(). It has been moved to start()
 2014-12-27 22:05:55 -05:00
Lorin Hochstein
3665c92856 docker: fix volume[s]_from typo 
Code makes reference to volume_from instead of volumes_from. If volumes_from is
passed as an argument, generates a KeyError.
 2014-12-25 23:31:06 -05:00
Jan Weitz
ebf9b8c6e2 Fixes invalid dictionary access. 2014-12-24 13:15:40 +01:00
Jan Weitz
82601fdc54 Fixes version check for docker-py 2014-12-24 03:04:04 +01:00
Toshio Kuratomi
c4f9366e91 Newstyle class 2014-12-18 13:43:55 -08:00
Toshio Kuratomi
f65d9ab793 Make insecure_registry feature version check against the client API 2014-12-18 12:45:13 -08:00
Maksim Losev
4172d445d3 Add insecure_registry to docker-py pull method 
Starting from docker-py>=0.5.0 it is impossible to work with private registries based on HTTP.
So we need additional parameter to allow pull from insecure registry
Related to ansible/ansible#9111
 2014-12-18 12:36:17 -08:00
Toshio Kuratomi
fa0fa9d221 Make docker ver checks issue failures rather than silently ignoring 
Also:
* make client version checks robust for two digit version pieces and
  alpha versions
* consolidate version checking code
 2014-12-18 11:23:44 -08:00
Ingo Gottwald
80d45c78a3 Add support for new docker restart policies 2014-12-18 10:27:53 +01:00