Commit graph

1371 commits

Author SHA1 Message Date
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
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
Matt Martz
a4e65e8e6e Prevent an empty error message 2015-03-10 11:30:14 -05: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
Toshio Kuratomi
edf1ac1ea6 Sort subnets by the order they are specified in the play
Fixes #172
2015-03-06 14:55:11 -08: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
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
9f38f6e6a2 Small code cleanup 2015-03-03 12:07:42 -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
Brian Coca
72b49f4c71 Merge pull request #846 from mlaccetti/devel
Change s3 to use connect_to_region
2015-03-03 08:51:35 -05:00
Michael Laccetti
5e7605475d Moving the import to the top of the file and getting rid of the redundancy
I sure do wish I knew where the whitespace change was coming from, though. Frustrating.
2015-03-02 20:12:54 -05:00
Feanil Patel
4a195c64f1 Compare DNS names case insensitively. 2015-03-02 10:59:14 -05:00
James Cammarata
05904a7e17 Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into devel 2015-02-27 11:01:46 -06:00
James Cammarata
db38d31f02 Updating version added fields for new alias parameters in route53 2015-02-27 11:00:21 -06:00
James Cammarata
49a493662a Merge branch 'route53-alias' of https://github.com/Coderah/ansible-modules-core into Coderah-route53-alias 2015-02-27 09:50:00 -06:00
James Cammarata
0c53b9033c Merge pull request #747 from barraponto/ec2_instance_info
Add ec2 instance tags and groups info
2015-02-27 09:41:08 -06:00
Monty Taylor
2e4091f31d One more OpenStack deprecation notice
Fixes #858
2015-02-27 07:05:03 -05:00
James Cammarata
fafb93490c Add private_zone parameter for route53
Fixes #473
2015-02-26 21:35:47 -06:00
Monty Taylor
cae8241ea7 Add deprecation notices for old OpenStack modules 2015-02-26 21:12:27 -05:00
Monty Taylor
dd4a6e86bd Deprecate old OpenStack modules
There are a completely new set of modules that do all of the things like
keystone v3 and auth_plugins and the like correctly. Structurally
upgrading these would have been massively disruptive and there is no
real good way to do so without breaking people.

These modules should be kept around for several releases - they still
work for people - and they should get bug fixes. But they should not
take new features. New features should go to the os_ modules.
2015-02-26 10:00:49 -05:00
Brian Coca
ec755796c0 Merge pull request #827 from bcoca/ec2_ami_handle_exceptions
now captures connection exceptions and returns in 'nicer' module failure
2015-02-25 10:37:43 -05:00
Michael Laccetti
60e2e43f00 Change s3 to use connect_to_region
* Allows us to use Ansible/s3 for GovCloud when accessing a pre-existing bucket
2015-02-25 08:46:13 -05:00
Brian Coca
d2158708ff undeprecated docker_image until replacement actually arives 2015-02-23 12:43:10 -05:00
Toshio Kuratomi
c88259077e Merge pull request #698 from joelthompson/devel
ec2_group with purge_rules will purge too many rules.
2015-02-21 06:42:20 -08:00
Brian Coca
af31cb8faf now captures connection exceptions and returns in 'nicer' module failure 2015-02-20 09:28:11 -05:00
Jorge-Rodriguez
57f0d22482 Added optional parameter scheduler_hints. 2015-02-20 12:51:18 +02:00
Bret Martin
bc0c1692b5 ec2: make group only match group names in this VPC 2015-02-19 11:28:13 -05:00
Edward
3fbfd7351b Fixes #816 Backups not enabled on new droplets.
Convert backups_enabled string to lowercase. Similar to fix for private
networking.
2015-02-18 21:23:11 -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
53ef859ae4 fix instance=None documentation 2015-02-18 13:32:50 -05:00
Brian Coca
77241123a7 Revert "Revert "Don't use 'tenancy' in ec2 spot requests"" 2015-02-18 11:07:13 -05:00
Brian Coca
7c42182f47 Revert "Don't use 'tenancy' in ec2 spot requests" 2015-02-18 08:59:26 -05:00
Matt Martz
5824f78773 Merge pull request #798 from sivel/rax-boot-vol-v2
rax: add boot from volume support
2015-02-17 12:31:32 -06: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
Matt Martz
3dbf65f63c DRY up duplicate code 2015-02-17 10:45:29 -06:00
Brian Coca
706be79f8f Merge pull request #528 from lander2k2/password_required
TODO: check if instance already exists and this is not meant to create it but modify it, not supported by current code which always tries to create when 'present'.
2015-02-16 19:04:09 -05:00
Brian Coca
ed8ded7127 Merge pull request #519 from lander2k2/public_ips
set network_config.public_ips attribute
2015-02-16 19:02:18 -05:00
Matt Martz
f1667ba53b Don't hardcode minimum for boot_volume_size 2015-02-16 17:58:47 -06:00
Matt Martz
d0e82fa3af Fix order of logic to determine required args 2015-02-16 17:58:47 -06:00
Matt Martz
b0dcff214a Add boot from volume functionality to rax and rax_cbs modules 2015-02-16 17:58:47 -06:00
Matt Martz
98d86529f4 Merge pull request #797 from sivel/rax-cbs-no-min-check
rax_cbs: Don't hardcode a minimum size of a volume
2015-02-16 17:54:51 -06:00
Brian Coca
6c4804e413 Merge pull request #22 from teamdoug/devel
Pull SSL certificate IDs from existing ELBs
2015-02-16 18:49:37 -05:00
Matt Martz
188138a40f Merge pull request #788 from sivel/rax-clb-100plus
rax_clb: Support accounts with more than 100 load balancers
2015-02-16 15:35:23 -06:00
Matt Martz
b4ce4f3722 Don't hardcode a minimum size of a volume 2015-02-16 15:33:14 -06:00
mcameron
24f8792bab More general output. 2015-02-16 15:08:39 +00:00
mcameron
8eb7870a5e Useful log output. 2015-02-16 14:58:53 +00:00
Matt Martz
d03e9540a6 Support accounts with more than 100 load balancers 2015-02-13 15:12:24 -06:00
Robert Marsa
584f210eea Added the ability to set an instance to forward ip. 2015-02-12 14:24:03 -08:00
Robert Marsa
ea1122d49f Added target_tags to gce_module. 2015-02-12 10:01:41 -08:00
Toshio Kuratomi
5165ff4e15 Merge pull request #769 from tpaz/devel
resolve issue 764
2015-02-11 07:29:05 -08: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
moussa taifi
ab8b4c0270 Adds the currently available instance types for azure to the available dict(choices..... 2015-02-10 11:14:28 -05:00
Luc Bourlier
df53b85259 Don't use 'tenancy' in ec2 spot requests
The problem was introduced in commit f5789e8e. 'tenancy' is a parameter of
ec2.run_instances, but not in ec2.request_spot_instances. So it was breaking
the support for spot requests.
2015-02-10 13:43:11 +00:00
Capi Etheriel
5854f53cdc add ec2 instance tags and groups info 2015-02-09 18:46:20 -02:00
Coderah
aa2b1f033b add alias support to route53 module 2015-02-06 15:23:01 -08:00
Coderah
d92cd07156 add hosted_zone information to ec2_elb_lb return 2015-02-06 15:23:01 -08:00
Jean-Baptiste Barth
6090c4e109 Improve formatting after previous commit 2015-02-04 10:22:24 +01:00
Jean-Baptiste Barth
b451cbd37b EC2: move logic about terminated instances up (#423)
As stated in #423, the commit 7f11c3d broke ec2 spot instance launching
after 1.7.2. This is because it acts on the 'res' variable which have 2
different types in the method, and in case we request spot instances,
the resulting object is not a result of ec2.run_instances() but
ec2.request_spot_instances(). Actually this fix doesn't seem to be
relevant in the spot instances case, because by construction we won't
retrieve 'terminated' instances in the end.
2015-02-04 10:22:24 +01:00
moe
0d0205ad54 Woops, make collect/delete loop more efficient. 2015-02-04 06:13:52 +01:00
moe
047bd6f651 Fixes #744.
The following cases work for me now:
- Create new ASG with tags
- Update tags on ASG (create/change/delete)

In short, the module should now work as expected
wrt tagging. The previous code did not work at all
with latest boto for me (serialization errors) and
the logic was buggy anyway; e.g. removed tags
would never get deleted from ec2.
2015-02-04 05:56:19 +01:00
Sergey Zhukov
7baaf97a8b Fixed broken volumes_from for client API >= 1.10 2015-01-30 19:58:12 +03:00
Matt Ferrante
e1f2c570eb check keys is in dim2 before evaluating 2015-01-29 16:36:35 -05:00
Peter Mooshammer
0c49d9f6c6 adding disk_type option to choose from pd-ssd or pd-standard 2015-01-29 10:19:01 -08:00
Brian Coca
e2083bbe8a corrected version added for latest features 2015-01-28 12:55:05 -05:00
Brian Coca
82afff31a9 Merge pull request #718 from bcoca/rds_refactor_fixes
minor fixes on new rds refactor
2015-01-28 12:49:20 -05:00
Matt Martz
835f762cbb Merge pull request #672 from sivel/rax-cdb-db-fixups
rax_cdb_database: Remove unnecessary logic, return the database on delete
2015-01-28 11:46:58 -06:00
Brian Coca
a28ad0db83 minor fixes on new rds refactor 2015-01-28 12:36:04 -05:00
Brian Coca
c5d7f07aa0 Merge pull request #5 from willthames/rds_refactor
Rds refactor
2015-01-28 12:34:12 -05:00
Joel Thompson
01c4ff922f Fixes issue 697 -- only purge the grants that need to be purged 2015-01-24 00:52:37 -05: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
Toshio Kuratomi
6f47416cec Merge pull request #641 from ansible/fix-640
Potential fix for 640
2015-01-22 21:45:10 -08:00
Toshio Kuratomi
ed15a71162 Merge pull request #677 from ryanobjc/devel
Fixes #581 - digitalocean module cannot create private_networking=true d...
2015-01-22 21:39:07 -08:00
Phillip Holmes
c5cb352262 Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into ansible-devel 2015-01-22 15:04:55 -06:00
Toshio Kuratomi
1dca812662 Merge pull request #685 from bcoca/ec2_doc_form_fix
ec2 fix docs format
2015-01-21 23:40:06 -08:00
Brian Coca
9e1847ed03 ec2 fix docs format 2015-01-21 20:09:46 -05:00