Commit graph

1540 commits

Author SHA1 Message Date
Robert Marsa
74e94f2712 Added multiple allowed ranges. 2015-03-17 13:49:53 -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
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
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
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
Brian Coca
d66c3fcf51 moved defaulting to module constant to after when it is defined 2015-01-21 19:50:34 -05:00
Ryan Rawson
0162fc525d Fixes #581 - digitalocean module cannot create private_networking=true droplets 2015-01-21 16:04:15 -08:00
Doug Ellwanger
10aaa1137c Pull SSL certificate IDs from existing ELBs 2015-01-21 15:29:46 -08:00
Brian Coca
95d4b796c0 updated tenancy version added 2015-01-21 17:27:40 -05:00
Brian Coca
68a49bc6fb Merge pull request #4 from atlashealth/ec2_tenancy
Support for EC2 dedicated tenancy option
2015-01-21 17:18: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
Jan Brauer
e2abbbefd7 Handle the case where a stack rollback fails. 2015-01-21 13:36:36 +01:00
Matt Martz
d4074ccd96 Remove unnecessary logic, return the database on delete 2015-01-20 14:07:35 -06:00
Matt Martz
1668f45447 Merge pull request #667 from sivel/rax-identity-fixups
rax_identity: Small fix ups
2015-01-20 10:38:16 -06:00
Matt Martz
4db7ef6c2d Merge pull request #666 from sivel/rax-cbs-attach-fixups
rax_cbs_attachments: Small Fix-ups
2015-01-20 10:37:56 -06:00
Matt Martz
3278b9824b Merge pull request #665 from sivel/rax-cbs-delete-resp
rax_cbs: make sure to return the volume details after deletion
2015-01-20 10:37:44 -06:00
Alex Clifford
df2088377b ttl should always be used during a delete 2015-01-20 10:43:22 +11:00
Matt Martz
c526a695de Remove unnecessary required arg logic, and remove 'absent' as a valid choice since it isn't implemented 2015-01-19 13:08:56 -06:00
Matt Martz
32ef72df2e Small fix-ups to convert objects to dicts, update volume details at the appropriate time, and remove unnecessary required argument logic 2015-01-19 12:43:30 -06:00
Matt Martz
f3d8d0f83f Remove some broken and unnecessary required args logic 2015-01-19 10:58:22 -06:00
Matt Martz
d8032ecc81 Use rax_to_dict and make sure to return the volume details after deletion 2015-01-19 10:54:22 -06:00
Brian Coca
0794597c7e corrected release when this feature was added 2015-01-19 09:34:27 -05:00
Matt Martz
09b3c20c07 Merge pull request #654 from sivel/rax-mods-required
rax_keypair / rax_network: Clean up some required argument logic
2015-01-16 16:33:53 -06:00
Matt Martz
6ca357198e Clean up some required argument logic 2015-01-16 15:33:41 -06:00
Matt Martz
ee928dc000 Merge pull request #650 from sivel/rax-clb-nodes-bad-logic
rax_clb_nodes: It is not correct that you need at least 1 primary node
2015-01-16 08:55:37 -06:00
Matt Martz
8609a50450 Merge pull request #652 from sivel/rax-clb-required
rax_clb: Just use built in required functionality for arguments
2015-01-16 08:54:34 -06:00
Matt Martz
d2829c2510 Just use built in required functionality for arguments 2015-01-15 19:27:34 -06:00
Matt Martz
b2fd4d18e0 It is not correct that you need at least 1 primary node 2015-01-15 19:20:36 -06:00
Toshio Kuratomi
6cbce4d911 Potential fix for 640 2015-01-13 22:39:20 -08:00
Alex Clifford
d2ae2e6cc6 Fix slight typo in doco 2015-01-14 12:12:02 +11:00
Brian Coca
7fc142cc13 Merge pull request #634 from br0ziliy/fix-gce-net-src-tags-param-parsing
gce_net - creating firewall rule, src_range value seems to get lost or set to empty string
2015-01-13 11:10:36 -05:00
Brian Coca
0edfdca58b Merge pull request #105 from luisguilherme/devel
ec2_lc does not create valid launch configuration for EC2-Classic
2015-01-13 11:04:21 -05:00
Michael DeHaan
d3297dc8a8 Merge pull request #598 from jsmartin/fix_asg_zone_identifier
vpc_zone_identifier must be a csv string when an asg is updated.
2015-01-08 13:46:16 -05:00
James Martin
242aa9f81b vpc_zone_identifier must be a csv string when an asg is updated. 2015-01-07 14:39:28 -05:00
Toshio Kuratomi
1ca8b42770 Merge pull request #599 from bcoca/vmware_template_version
added version added for new template options
2015-01-06 13:38:18 -08:00
Brian Coca
53404c786a added version added for new template options 2015-01-06 16:06:45 -05:00
Vasyl Kaigorodov
c1eb7a4c1d gce_net - creating firewall rule, src_range value seems to get lost or set to empty string -- fixes #252 2015-01-06 20:44:09 +01:00
Luís Guilherme F. Pereira
cfda942376 Allow ec2_lc to create EC2-Classic Launch Configs
Removes default value from ec2_lc so it can create launch configurations valid on a EC2-Classic environment. AWS API will not accept a assign_public_ip when creating an ASG outside of VPC.
2015-01-06 09:30:44 -02:00
Philip Misiowiec
71d1044b8b Adds tenancy state to returning json 2014-12-31 00:45:57 -08:00
Philip Misiowiec
ad7f5abf28 Ability to detach an EBS volume from an EC2 instance 2014-12-30 23:17:49 -08:00
tedder
c5fe40661d feature pull request: catch and retry recoverable errors
boto can throw SSLError when timeouts occur (among other SSL errors). Catch these so proper JSON can be returned, and also add the ability to retry the operation.

There's an open issue in boto for this: https://github.com/boto/boto/issues/2409

Here's a sample stacktrace that inspired me to work on this. I'm on 1.7, but there's no meaningful differences in the 1.8 release that would affect this. I've added line breaks to the trace for readability.

    failed to parse: Traceback (most recent call last):
      File "/home/ubuntu/.ansible/tmp/ansible-tmp-1419895753.17-160808281985012/s3", line 2031, in <module> main()
      File "/home/ubuntu/.ansible/tmp/ansible-tmp-1419895753.17-160808281985012/s3", line 353, in main download_s3file(module, s3, bucket, obj, dest)
      File "/home/ubuntu/.ansible/tmp/ansible-tmp-1419895753.17-160808281985012/s3", line 234, in download_s3file key.get_contents_to_filename(dest)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1665, in get_contents_to_filename response_headers=response_headers)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1603, in get_contents_to_file response_headers=response_headers)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1435, in get_file query_args=None)
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 1488, in _get_file_internal for bytes in self:
      File "/usr/local/lib/python2.7/dist-packages/boto/s3/key.py", line 368, in next data = self.resp.read(self.BufferSize)
      File "/usr/local/lib/python2.7/dist-packages/boto/connection.py", line 416, in read return httplib.HTTPResponse.read(self, amt)
      File "/usr/lib/python2.7/httplib.py", line 567, in read s = self.fp.read(amt)
      File "/usr/lib/python2.7/socket.py", line 380, in read data = self._sock.recv(left)
      File "/usr/lib/python2.7/ssl.py", line 341, in recv return self.read(buflen)
      File "/usr/lib/python2.7/ssl.py", line 260, in read return self._sslobj.read(len) ssl.SSLError: The read operation timed out
2014-12-29 17:19:12 -08: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
Mick Bass
2d189f0d19 add retry with exponential backoff when we receive throttling error code from cloudformation 2014-12-25 14:37:08 -07:00
Toshio Kuratomi
925c9ab42d Merge pull request #561 from weitzj/bugfix/docker-extra-params
Fixes invalid dictionary access.
2014-12-24 14:58:57 -08:00
Brian Coca
1e8abd2594 Merge pull request #562 from phips/fix_vsphere_folder
vsphere_guest fix for KeyError: folder message
2014-12-24 08:52:22 -05:00
Mark Phillips
8ede9de895 vsphere_guest fix for KeyError: folder message 2014-12-24 12:39:48 +00: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
Brian Coca
62a53b1209 Merge pull request #541 from bcoca/cloudformation_china
update to use connect_to_region to avoid errors with china
2014-12-23 13:40:49 -05:00
Brian Coca
0ab5682b87 Merge pull request #260 from willthames/aws_frankfurt
Added better region handling and enabled eu-central-1, leaving centralizing the list on these modules to a subsequent patch
2014-12-22 08:47:27 -05: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
Brian Coca
d564569910 update to use connect_to_region to avoid errors with china 2014-12-17 19:55:54 -05:00
Brian Coca
8e5a849c66 Merge pull request #3 from atlashealth/ec2_vol_ssd_ebs
Ability to specify new SSD EBS option
2014-12-17 19:08:41 -05:00
Richard Lander
dc5641afe3 azure check for hosted service and vm before creating 2014-12-17 17:29:07 -05:00
Brian Coca
3ee8e2840f Merge pull request #6 from willthames/ec2_snapshot_remove
Added the ability to remove snapshots
2014-12-17 17:28:47 -05:00
Brian Coca
978204aaa2 Merge pull request #496 from haraldsk/devel
add support for stack policies in cloudformation
2014-12-17 16:46:56 -05:00
Kale Franz
73172fae47 #531 correction
correct list comprehension for older versions of python (back to python 2.4)
2014-12-17 09:01:50 -08:00
Kale Franz
e174c9b474 fixes #529 ec2_group module bug 2014-12-17 03:34:47 -08:00
Toshio Kuratomi
c853bb5a0f Merge pull request #518 from likwid/devel
Fixed formatting in cloudformation example
2014-12-16 23:18:01 -08:00
Richard Lander
73e32db22f password required 2014-12-16 17:28:12 -05:00
Toshio Kuratomi
51ed13b887 Fix documentation build 2014-12-16 11:50:41 -08:00
Brian Coca
4cfc8d6950 Merge pull request #72 from stewrutledge/vmtemplate
Added support for deploying virtual machine from a virtual template
2014-12-15 20:01:54 -05:00
Richard Lander
0ab3b30b2f set network_config.public_ips attribute 2014-12-15 16:26:33 -05:00
Jeff Gonzalez
369eeb2666 Fixed formatting in documentation
The example was using mixed shorthand and long form yaml (region: "us-east-1 disable_rollback=true"

I modified the entire example to be long form.
2014-12-15 10:18:31 -06:00
Mike Putnam
5c6f375c17 Type fix on delete_snapshot docs. 2014-12-12 13:29:51 -06:00
Toshio Kuratomi
f4625a3dd1 Fixup the directory name at a higher level so it can be used by both conditional branches
Fixes #500
2014-12-12 11:23:17 -08:00
Matt Martz
7a6a30abbe Merge pull request #492 from sivel/rax-asg-improvements
Make a few enhancements to the rax_scaling_group module
2014-12-11 12:59:16 -06:00
Matt Martz
9eb2bff946 Make a few enhancements to the rax_scaling_group module
* Cast loadbalancer id and port to integers
* Do not attempt to base64 encode NoneType values
2014-12-11 12:58:12 -06:00
Harri Hämäläinen
b354423bae Fixed typo in comment 2014-12-11 18:59:42 +02:00
Harald Skoglund
5bc8d5b96e add support for stack policies in cloudformation 2014-12-11 16:41:25 +01:00
Peter Gehres
05ca85a172 Issue #489: s3 should not fail on checksum mismtach when overwrite=no 2014-12-10 10:50:16 -08:00
PikachuEXE
6ce7e63c5f ~ Add missing documentation for option email 2014-12-10 10:23:59 +08:00
Mike Putnam
55a51f4ca9 Clarify possible variable value in the docs. 2014-12-09 10:09:05 -06:00
Michael DeHaan
95aa8481b2 Merge pull request #466 from marcus-ahle/devel
Preventing Nonetype is not iterable error when no tags are set for new ASG
2014-12-08 14:26:16 -08:00
Marcus Ahle
ba5c36ce5a Preventing Nonetype is not iterable error when no tags are passed in for a newly created ASG 2014-12-08 12:55:27 -05:00
Ben Whaley
cf24e7d56c vpc_zone_identifier should be a list as per the docs 2014-12-05 18:04:16 -08:00
Scott Miller
53afd359f6 fix documentation
AWS does not recognize the subnet if it is presented in a comma delimited format with spaces. you must remove the space for Amazon to recognize the second subnet.
2014-12-03 11:45:42 -05:00
Toshio Kuratomi
5af4463823 Gixes to doc formatting 2014-12-03 08:17:15 -08:00
Brian Coca
71224c8678 Merge pull request #420 from drfickle/route53_float_fix
route53 module retry_interval needs to be a float before passing to time.sleep
2014-12-03 11:10:32 -05:00
Francois Deppierraz
f69a7553f7 Fix auto_floating_ip documentation
The default value is 'no' instead of the currently documented 'yes'.

See cloud/openstack/nova_compute.py line 543:

        auto_floating_ip                = dict(default=False, type='bool'),
2014-12-03 16:06:50 +01:00
willthames
b287e7c0a6 Added the ability to remove snapshots
Added state option, and accompanying snapshot_id option for
when state=absent.
2014-12-02 11:18:53 +10:00
Will Thames
565fa9a0ae Fixed tagging 2014-12-02 11:12:40 +10:00
Denver Janke
0edb9f51e8 Fix few bugs around renaming db instances. 2014-12-02 11:11:30 +10:00
Will Thames
a1a6201b82 Improved error handling
More tests, particular for failure testing
2014-12-02 11:11:30 +10:00
Will Thames
7a8586c53c RDS rewrite to use boto.rds and boto.rds2
Using rds2 allows tags and the control over whether or not DBs are
publicly accessible.
Move RDS towards a pair of interfaces implementing the details of rds
and rds2
Added tests to ensure that all operations work correctly as well as
requirements files that allow virtualenvs to test either boto.rds or
boto.rds2
2014-12-02 11:11:30 +10:00
Steve Fox
c03ec202a7 retry_interval needs to be a float before passing to time.sleep 2014-12-01 14:21:52 -06:00
Michael DeHaan
9de0045d00 Remove potentially out of date or specific product references. 2014-12-01 15:16:22 -05:00
Michael DeHaan
e7c92a6bc6 More EC2 doc tweaks 2014-12-01 15:14:57 -05:00
Michael DeHaan
c6b0d469ac Misc EC2 doc tweaks. 2014-12-01 14:46:07 -05:00
Philip Misiowiec
59701feadb added version 2014-12-01 10:55:22 -08:00
Philip Misiowiec
f5789e8eda Support for EC2 dedicated tenancy option 2014-12-01 10:55:22 -08:00
Philip Misiowiec
c241e9dd9c added version 2014-12-01 10:52:22 -08:00
Philip Misiowiec
b37a2328c0 Ability to specify new SSD EBS option 2014-12-01 10:52:22 -08:00
Robert Estelle
5e694c490c ec2_group allow empty rules. 2014-12-01 13:04:15 -05:00
follower
a6e0d9d613 Fix typo of "rules_egress"
Or is "rules_egree" supposed to be a plural? The sentence is difficult to parse.

Maybe the correct fix is to "Purge existing rules on security group that are not found in rules_egress"?
2014-11-29 18:05:22 +13:00
Will Thames
30c7f9a7d3 Added better region handling and enabled eu-central-1
Make use of improved connect_to_aws that throws an exception
if a region can't be connected to (e.g. eu-central-1 requires
boto 2.34 onwards)

Add eu-central-1 to the two modules that hardcode their regions
Add us-gov-west-1 to ec2_ami_search to match documentation!
This pull request makes use of the changes in ansible/ansible#9419
2014-11-22 11:35:46 +10:00
Achilleas Pipinellis
cab378bff6 Add note about using version 1 of DigitalOcean API. 2014-11-17 17:01:26 +02:00
IndyMichaelB
5a628aacd4 docfix for vsphere_guest.py
Corrected parameter name from user to username in documentation
2014-11-16 16:59:57 -05:00
Sam Kottler
7b875dbda5 Remove trailing whitespace in digital_ocean_domain 2014-11-15 16:21:07 -05:00
Nejc Zupan
6f6eca5b4e digital ocean: Remove unsupported states 2014-11-15 16:12:46 -05:00
Toshio Kuratomi
c6522620c5 Clean up the docker module just a little so that we can unittest the get_split_image_tag function 2014-11-14 08:46:32 -08:00
Robert Estelle
4dd099fe7a Remove incorrect executable permissions. 2014-11-13 18:08:48 -05:00
Adam Miller
01db13e3ad fix gce_net add firewall rule example 2014-11-13 15:27:10 -06:00
Stewart Rutledge
6d79518d67 Fixed a typo on power options 2014-11-13 22:01:26 +01:00
sterutkb
1dd20197b1 Added support for deploying virtual machine from a virtual template 2014-11-13 22:00:57 +01:00
John Batty
08b2752080 Fix get_flavor_id() when flavor_ram is specified
Without this fix, _get_flavor_id() fails to find a matching flavor if
both:
* the flavor_ram parameter is specified
* the first flavor in the list does not match.

The bug is simply that the module.fail_json() call lies within the loop
iterating through the flavors.  This call should only be made if the
loop completes and no matching flavors have been found.
2014-11-13 13:26:20 +00:00
Brian Coca
3a967c8005 Merge pull request #290 from ctrlaltdel/devel
Fix a typo in nova_compute documentation string
2014-11-12 16:33:57 -05:00
Brian Coca
1622e3b2df Merge pull request #284 from borgified/devel
typo in comments: of -> or
2014-11-12 16:33:20 -05:00
James Cammarata
a7749a8fce Merge pull request #309 from jsmartin/asg_fix_delete
asg will now be terminated if state=absent.
2014-11-12 13:16:49 -06:00
James Martin
341c7ce307 asg will now be terminated if state=absent.
adds mutually exclusive options
2014-11-12 12:44:03 -05:00
James Cammarata
710b7b9aba Merge pull request #308 from jsmartin/asg_orphaned_code
Removes orphaned code.
2014-11-12 11:16:06 -06:00
James Cammarata
ae744f98d8 Serialize tag attributes to ASG properties in ec2_asg
Fixes #108
2014-11-12 11:04:43 -06:00
James Martin
d5326e6dbd Removes orphaned code. 2014-11-12 11:48:06 -05:00
James Martin
f287600e6c fixes #240, #274, #108 2014-11-11 19:47:34 -05:00
José Moreira
03cf57c6f0 Fixed small typo on ec2 task name 2014-11-10 11:24:31 +00:00
Francois Deppierraz
2dee52616d Fix a typo in nova_compute documentation string
Without this patch, ansible-doc was failing this way:

$ ansible-doc nova_compute
Traceback (most recent call last):
  File "/home/francois/WORK/dev/ansible/bin/ansible-doc", line 324, in <module>
    main()
  File "/home/francois/WORK/dev/ansible/bin/ansible-doc", line 316, in main
    text += get_man_text(doc)
  File "/home/francois/WORK/dev/ansible/bin/ansible-doc", line 112, in get_man_text
    desc = " ".join(opt['description'])
KeyError: 'description'
2014-11-10 09:30:29 +01:00
Fwiffo
6cb8a5f312 typo in comments: of -> or 2014-11-07 15:20:49 -08:00
Michael DeHaan
2970b339eb Deprecate docker_image, use the docker module to deploy docker images, or shell out to docker to call
docker build if you want from a playbook.
2014-11-05 16:13:55 -05:00
Dan Abel
4c04366882 use aws connect calls that allow boto profile use 2014-11-05 17:31:34 +00:00
Dan Abel
a70f1c7718 use simpler ec2_connect ec2 util call
This allows boto profile use
2014-11-05 17:28:47 +00:00
Tom Wadley
1e08f508c6 use aws connect call in rds_subnet_group that allows boto profile use 2014-11-05 17:11:12 +00:00
Brian Coca
19ed60196c added __init__.py to new cloud subcategories so builds work again 2014-11-05 11:07:19 -05:00
Brian Coca
0c4adcb2c6 made subcategories for cloud modules for better organization 2014-11-04 11:18:09 -05:00
James Cammarata
3fe48db44f Fail in ec2 if exact_count is specified without using count_tag
Fixes ansible/ansible#9431
2014-11-03 09:43:26 -06:00
James Cammarata
30f46c9f8e Merge pull request #230 from lorin/ec2_snapshot_wait
ec2_snapshot: document wait, wait_timeout params
2014-10-27 11:10:09 -05:00
James Cammarata
a5d0fac078 Merge pull request #219 from adamchainz/devel
Update syntax for cloudformation example
2014-10-27 10:55:44 -05:00
Lorin Hochstein
142fd9b06d ec2_snapshot: document wait, wait_timeout params
Document the wait and wait_timeout params for ec2_snapshot.

This is important because snapshots can take a long time to complete,
and the module defaults to wait=yes.
2014-10-26 16:26:33 -04:00
Adam Chainz
f4ca909d59 Update syntax for cloudformation example 2014-10-23 17:23:24 +01:00
Jaanus Torp
0a6561f5d4 Fixed really annoying omission in the example without the task would complete without errors or warnings but delete all egress rules 2014-10-23 13:19:23 +01:00
Matt Martz
b8e82f8504 Merge pull request #115 from sivel/autoscale-more-args
rax_scaling_group module improvements
2014-10-22 12:27:15 -05:00
Matt Martz
7e3b7aff13 Merge pull request #116 from sivel/rax-skip-deleted
rax module: Don't count DELETED servers when adding new servers
2014-10-22 12:25:25 -05:00
Toshio Kuratomi
72185b4d9a Merge pull request #194 from rglew/devel
Fixed bug #193 where parameter name was set incorrectly
2014-10-22 11:29:07 -04:00
James Cammarata
3132463145 Merge pull request #187 from jorgebastida/devel
ec2_asg: Initialize create_changed and replace_changed
2014-10-21 22:48:08 -05:00
James Cammarata
47f11e87e3 Merge pull request #183 from sb98052/devel
Added user, tenant and password to module parameters declaration
2014-10-21 22:36:19 -05:00
Tim Gerla
044cef8419 Fix a typo of a function call 2014-10-17 10:47:17 -07:00