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

5763 commits

This branch
This branch
All branches
Author SHA1 Message Date
Toshio Kuratomi
e44ee190d2 Merge branch 'lorin-volumes_from' into devel 2015-03-13 13:44:31 -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
138bc239f9 Merge pull request #941 from ansible/docker-alias-running 
Make state=running work for backwards compatibility with 1.8
 2015-03-13 10:37:47 -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
Brian Coca
dfb58517fa Merge pull request #925 from InAnimaTe/patch-1 
Setting the actual passno and dump defaults, and warning user of consequ...
 2015-03-12 12:52:52 -04:00
Toshio Kuratomi
54fd95288e Merge pull request #927 from bobrik/fix-undefined-e 
[docker] fixed: global name 'e' is not defined
 2015-03-12 08:19:10 -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
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
Mario Loria
30be06c971 Setting the actual passno and dump defaults, and warning user of consequences in nulling 
Using ansible 1.8.4, I found that these two options actually work slightly different than advertised.
 2015-03-11 21:36:44 -04: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
Toshio Kuratomi
edf1ac1ea6 Sort subnets by the order they are specified in the play 
Fixes #172
 2015-03-06 14:55:11 -08: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