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

5938 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaanus Torp
aca893cf43 Added support for tagging images in ec2_ami.py 2015-03-19 15:39:42 +00:00
Brian Coca
42d91951cf Merge pull request #537 from zitterbacke/patch-2 
fix uri modul for JSON-escape quotation marks
should fix #121
 2015-03-19 09:12:29 -04:00
Eric Johnson
c7381a92b8 Merge pull request #956 from rmarsagoogle/gce_net 
Added multiple allowed ranges.
 2015-03-19 06:09:18 -07:00
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
Robert Marsa
74e94f2712 Added multiple allowed ranges. 2015-03-17 13:49:53 -07:00
Toshio Kuratomi
ae253593e3 Merge pull request #955 from Seraf/devel 
Fix the issue #931: ec2_asg : can't set desired_capacity to 0
 2015-03-17 10:57:50 -07:00
Julien Syx
23fdba26b5 Fix the issue #931 
Checking that the parameter doesn't exist. The old code had a bug when the parameter was 0.
 2015-03-17 17:57:18 +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
d65d04b3f8 Merge pull request #904 from ansible/ec2_vpc-sort 
Sort subnets by the order they are specified in the play
 2015-03-15 11:19: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
b530afc24e Merge pull request #943 from rowleyaj/patch-1 
cloud/amazon/s3: update documentation
 2015-03-14 07:38:23 -07:00
Alex Rowley
7d6cd3baaa cloud/amazon/s3: update documentation 
update description to show that module can do more than just put files into s3
 2015-03-13 21:08:30 +00:00
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