Commit graph

5692 commits

Author SHA1 Message Date
Stefan Junker
c3f92cca21 docker: Use a list instead of a dict for volumes according to the docker-py docs. Do not add host-binds to volumes list. 2015-03-12 12:55:14 +01:00
Stefan Junker
d8df5da49f merge and resolve conflict in docker.py 2015-03-12 12:47:54 +01:00
Toshio Kuratomi
31cc5f543f Fix for py2.6 (no dict comprehensions on py2.6) 2015-03-11 19:07:55 -07:00
Toshio Kuratomi
8ed415589a Initialize the value of vpc_id variable 2015-03-11 18:40:05 -07:00
Brian Coca
07d5b50e2c Merge pull request #903 from h3biomed/allow_default_subnet
Allow vpc_subnet_id to remain unspecified (see bc0c169)
2015-03-11 14:46:59 -04:00
Brian Coca
df835f8be9 Merge pull request #924 from hkariti/route53_public_zones
Fix KeyError in public zones in route53
2015-03-11 13:57:33 -04:00
Toshio Kuratomi
974075277d Also don't fail if files are different and overwrite is false for uploads (this mimics copy and template).
Related to #489
2015-03-11 08:59:38 -07:00
Hagai Kariti
d65f9aa3af Fix KeyError in public zones in route53 2015-03-11 17:30:20 +02:00
Toshio Kuratomi
ca32205c7b Documentation style changes 2015-03-11 08:26:16 -07:00
Toshio Kuratomi
47c6dae9f3 Merge pull request #490 from pgehres/devel
Issue #489: s3 should not fail on checksum mismtach when overwrite=no
2015-03-11 08:22:23 -07:00
Brian Coca
cf8098788c Merge pull request #922 from jbowes/fix-files-state-formatting
Fix C() formatting typo in file module
2015-03-11 09:14:25 -04:00
James Bowes
1e36b6b7f6 Fix C() formatting typo in file module 2015-03-10 21:43:45 -03:00
Matt Martz
edbb95303d Merge pull request #920 from sivel/empty-error-msg
rax: Prevent an empty error message
2015-03-10 11:40:17 -05:00
Matt Martz
a4e65e8e6e Prevent an empty error message 2015-03-10 11:30:14 -05:00
Brian Coca
0b0040a4ae updated to keep same info as in extras repo 2015-03-10 10:35:29 -04:00
Toshio Kuratomi
6b38382e9d Merge pull request #916 from bobrik/less-docker-reloads-in-links-and-env
[docker] Not triggering reload for links and not string env variables
2015-03-09 15:26:07 -07:00
Ian Babrou
9ecfde7551 not triggering reload for links and not string env variables 2015-03-09 22:49:00 +03:00
Toshio Kuratomi
e398933210 Merge pull request #912 from smashwilson/image-exposed-things
[docker] Account for configuration performed in the image for state=reloaded
2015-03-09 09:58:06 -07: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
Toshio Kuratomi
bd997b1066 Merge pull request #502 from smashwilson/docker-pull-option
Docker: state reorganization and pull option
2015-03-06 20:47:09 -08: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
Brian Coca
3da0aa9f08 Merge pull request #7 from Ernest0x/patch-1
synchronize: use a single -F instead of -FF
2015-03-06 15:13:37 -05:00
Bret Martin
f16d8d9afb Allow vpc_subnet_id to remain unspecified (see bc0c169) 2015-03-06 14:59:27 -05:00
Sam Yaple
e1e74bdf33 Updated version and fixed default 2015-03-06 03:13:55 -06:00
Brian Coca
76702b48f7 Merge pull request #896 from dagwieers/patch-1
Fix a (common) error in the examples.
2015-03-05 07:29:39 -05:00
Dag Wieers
0a91ace6ad Update authorized_key.py
Fix a (common) error in the examples. This is something that may go unnoticed during troubleshooting when copy&pasting the example.
2015-03-05 11:42:34 +01:00
Toshio Kuratomi
b0bc6f1379 Merge pull request #888 from ansible/mysql-port
Fix for int port assignment in a playbook failing
2015-03-04 18:57:32 -08:00
Toshio Kuratomi
ec6304d5a0 Merge pull request #824 from Jmainguy/mysql_db_616
Now correctly gzip/bzips file back up in case of import failure
2015-03-04 06:45:16 -08:00
Jonathan Mainguy
ee8039ef09 Now correctly gzip/bzips file back up in case of import failure
Removed gunzip and bunzip2 dependency
2015-03-04 09:07:24 -05:00
Eric Johnson
640e0fc53c Merge pull request #889 from nabam/gcloud-keep-disk
GCE module: allow to keep instance boot disk after instance deletion
2015-03-04 05:37:48 -08:00
Lev Popov
a15cce2d7f Allow to keep instance boot disk after instance deletion in google cloud module 2015-03-04 09:41:03 +01: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
Eric Johnson
bd8cfa2a24 Merge pull request #883 from nabam/gcloud-external-ip
Allow to spawn instances without external ip in google cloud module
2015-03-03 15:59:59 -08:00
Toshio Kuratomi
a1135f803d Fix for int port assignment in a playbook failing
Ports are integer values but the old code was assuming they were
strings.  When login_port is put into playbook complex_args as an
integer the code would fail.  This update should make the argument
validating make sure we have an integer and then we can send that value
directly to the relevant APIs.

Fixes #818
2015-03-03 14:23:07 -08:00
Toshio Kuratomi
6515354c81 Merge pull request #886 from ansible/ec2-small-cleanup
Small code cleanup
2015-03-03 13:43:56 -08:00
Toshio Kuratomi
9f38f6e6a2 Small code cleanup 2015-03-03 12:07:42 -08:00
Toshio Kuratomi
d80b7d3356 Merge pull request #885 from quodlibetor/ec2-module-fix-multiple-security-groups
ec2: Apply all security groups at instance-creation
2015-03-03 11:58:21 -08:00
Toshio Kuratomi
559af8d88d Clarify the documented behaviour of insertbefore slightly. 2015-03-03 11:38:08 -08:00
Toshio Kuratomi
8ec43e5bbc Merge pull request #411 from p-tr0/devel
Fix behavior when insert* doesn't match anything
2015-03-03 11:32:18 -08:00
Toshio Kuratomi
939ecd33d4 In service_enable, the default of changed is True so we have to set it
to False explicitly if it is False.

Fixes #875
2015-03-03 11:23:35 -08:00
Brandon W Maister
7f5aea980a ec2: Apply all security groups at instance-creation
The code was picking out the first instance from the security groups
specified, even when multiple groups were specified. Now we use all of
them.
2015-03-03 13:03:08 -05:00
Lev Popov
94c1b55744 Allow to spawn instances without external ip in google cloud module 2015-03-03 15:29:47 +01:00