Commit graph

893 commits

Author SHA1 Message Date
James Cammarata
778503c859 Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848 2014-07-09 12:24:06 -05:00
James Cammarata
812098b07e Merge branch 'issue_7906' of https://github.com/mpeters/ansible into mpeters-issue_7906 2014-07-09 12:09:40 -05:00
James Cammarata
2e614c8a63 Merge branch 'bug/8057' of https://github.com/ericwb/ansible into ericwb-bug/8057 2014-07-08 14:38:35 -05:00
James Cammarata
7793bd9638 Merge pull request #8049 from ranjan/dev
Provision VM using virtual network.
2014-07-08 10:11:18 -05:00
Eric Brown
7bbe3dc30c Adds an option to specify the glance endpoint type
Some environments that utilize an SSL terminator with a self-signed
certificate can use the publicURL without getting certificate
verify errors.  This allows using the internalURL with in my case
is HTTP and not HTTPS.

Closes issue: #8057
2014-07-08 00:30:40 -07:00
James Cammarata
0a33ac418a Merge pull request #8038 from caphrim007/correct-missing-msg-argument
Fix missing msg argument
2014-07-05 00:30:20 -05:00
James Cammarata
4ad4c8802a Merge pull request #8036 from sqs/remove-fragile-RDS-instance-type-validation
Remove validation of RDS DB instance type names because Amazon frequently adds new ones
2014-07-05 00:29:12 -05:00
James Cammarata
62456f5e27 Merge pull request #8022 from psa/vpc-gateway-peering
Fix for #7368 breaks peering connections. Unreak them.
2014-07-05 00:08:04 -05:00
Tim Rupp
821c133ff8 Fix missing msg argument
The following patch adds a missing 'msg=' syntax. An exception is raised
in ansible if this block is reached during the execution of the module

    TypeError: fail_json() takes exactly 1 argument (2 given)

With the 'msg=' added, you get a more informative error. For example

    msg: No settings provided to update_domain().
2014-07-04 14:00:15 -05:00
Quinn Slack
73c65e3db8 Remove validation of RDS DB instance type names because Amazon frequently adds new ones 2014-07-03 15:57:28 -07:00
Ranjan Kumar
8ef95374e7 Provision VM using virtual network. 2014-07-03 15:36:51 +05:30
Paul Armstrong
7b40939231 Fix for #7368 breaks peering connections. Unreak them. 2014-07-02 23:13:29 +00:00
James Cammarata
0a3e8c8e36 Merge pull request #7896 from botify-labs/feature/add-instance-monitoring-to-ec2-lc
Adds support for Cloudwatch detailled monitoring in ec2_lc module.
2014-07-02 09:50:27 -05:00
James Cammarata
2b1af586a2 Make sure subnets and route_tables are initialized before using
Fixes #7712
2014-07-02 09:26:51 -05:00
James Cammarata
935acf9efb Merge pull request #7925 from devpopol/fixes/api_error
fixes the now-incorrect module for ApiError -- noticed since 0.3.2
2014-06-25 22:33:22 -05:00
Tim Ruffles
5aba816396 grammar fix 2014-06-25 14:00:01 +01:00
Stephen Paul Suarez
1fa9c2adcc support old and new versions of APIError 2014-06-25 14:52:00 +08:00
Stephen Paul Suarez
8efce857b8 fixes the now-incorrect module for ApiError
https://github.com/dotcloud/docker-py/blob/0.3.2/docker/errors.py
- ApiError is now(0.3.2) under the docker.errors
2014-06-25 14:20:07 +08:00
James Cammarata
c61d04dd1f Check to make sure key exists in tag list before using it
Fixes #7910
2014-06-24 13:54:33 -05:00
Michael Peters
0d7a99d114 Fixing issue #7906
Catch any InvalidInstanceID.NotFound errors coming from the boto library
when trying to find the newly created instance. When this happens We should
just wait and try again.
2014-06-23 16:58:07 -04:00
Frédéric de Villamil
b535c2b2ca Adds support for Cloudwatch detailled monitoring in ec2_lc module.
Enabling detailled monitoring in the launch config is mandatory to be able to activate cloudwatch in the to be created autoscaling group.
2014-06-23 21:00:58 +02:00
James Cammarata
39e020abcc Merge pull request #7904 from loglevel9/7903
force evaluation of vars memory_mb, num_cpus to be int fixes #7903
2014-06-23 12:35:08 -05:00
James Cammarata
91d2fd89f7 Merge branch 'botify-labs-bug/fix-health-check-to-zero-bug/7898' into devel 2014-06-23 12:32:01 -05:00
Dann Bohn
cfea98e90b force evaluation of vars memory_mb, num_cpus to be int fixes #7903 2014-06-23 11:16:03 -04:00
Frédéric de Villamil
b4fc3cdb9a Adds support for health_check_period and health_check_type in ec2_asg module.
Default is set to 300 seconds, which is AWS default.

This PR fixes a bug (#7898) where instances created within an autoscaling group using the `ec2_asg` module gets immediately terminated because the `health_check_period` is set to 0, which causes the instance to be checked without having the time to actually boot.

Adding `health_check_type` is needed because you may want to check your instance health against an ELB instead of just EC2 default cloudwatch.
2014-06-23 12:09:31 +02:00
Frédéric de Villamil
72035367fe Adding support for spot instances in ansible_lc.
AWS allows to define launch configuration with spot instances. This is also natively supported by boto (see http://boto.readthedocs.org/en/latest/ref/autoscale.html)
2014-06-23 09:05:47 +02:00
James Cammarata
649cd5838c Conditionally try to get ebs_optimized parameter from instance 2014-06-20 14:26:21 -05:00
Yap Sok Ann
79c948e73d ec2_vpc: Fix error when using InstanceId as a route gateway.
See https://github.com/ansible/ansible/issues/7368

Fixes #7368
2014-06-20 14:08:22 -05:00
James Cammarata
5006ef9732 Merge branch 'exit_json' of https://github.com/psa/ansible into psa-exit_json 2014-06-20 13:59:55 -05:00
Michael Peters
dda0889aec Use the right name for the vpc_id parameter
Fixes #7853
2014-06-20 10:49:41 -05:00
Michael Peters
ef11416771 This should fix issue #7848
We need to catch any InvalidVpcID.NotFound errors and treat them
just like getting back a vpc that's not "available"
2014-06-19 14:25:05 -04:00
James Cammarata
43e661df0b Merge pull request #7829 from bennojoy/asg_policy
return properties of the newly created scaling policy
2014-06-19 10:38:38 -05:00
James Cammarata
56583f6006 Merge pull request #7827 from willthames/delay_tagging_in_ec2
ec2 module: Delay instance tagging to later in the instance creation process
2014-06-19 10:37:59 -05:00
James Cammarata
606ad373da Merge branch 'issue_7828_rds_param_group' into devel 2014-06-19 10:31:33 -05:00
Benno Joy
ce939b77a2 return properties of the newly created scaling policy 2014-06-19 08:09:39 +00:00
James Cammarata
a3c79eebb7 Fixing doc typos and adding version_added for tags param in ec2_asg 2014-06-19 00:10:59 -05:00
James Cammarata
ff6d21919f Merge branch 'ec2_asg_info' of https://github.com/dataxu/ansible into dataxu-ec2_asg_info 2014-06-19 00:09:11 -05:00
James Cammarata
46ba655cfa Handle integer param values that are calculated values
Fixes #7828
2014-06-19 00:04:04 -05:00
willthames
e45858ba7f Delay instance tagging to later in the instance creation process
Tagging recently created instances can result in
InvalidInstanceID.NotFound errors.

By delaying the tagging until the last part of instance creation,
we should be typically more fortunate (avoiding all such race
conditions might need more work)
2014-06-19 11:21:28 +10:00
Roberto Migli
ab9d6ad38b Fixed error in docs 2014-06-18 18:29:06 +02:00
Roberto Migli
0353ccb603 Fixed typo in docs 2014-06-18 18:22:50 +02:00
James Cammarata
d604bb6dc6 Merge pull request #7755 from sivel/rax-asg-normalize-nic
module rax_scaling_group: safe normalization of nics
2014-06-16 11:42:44 -05:00
Brice Leroy
f65f5bc4c7 Fix task description 2014-06-13 15:15:29 -07:00
Matt Martz
b29535c981 Perform safe normalization of nics to use uuid 2014-06-13 12:17:42 -05:00
James Cammarata
de94863eb1 Catch error in azure related to a failed deployment when creating a vm 2014-06-12 10:25:31 -05:00
James Cammarata
09b16c987d Merge branch 'devel' of https://github.com/matlockx/ansible into matlockx-devel 2014-06-12 09:32:03 -05:00
James Cammarata
acd0ab31cf Merge branch 'sivel-rax-autoscale' into devel 2014-06-12 08:14:39 -05:00
James Cammarata
c8845cdc65 Merge pull request #7687 from ryanpetrello/devel
Fix neutron floating IP allocation for networks w/ multiple subnets
2014-06-10 09:42:34 -05:00
James Cammarata
b59aded177 Merge branch 'rax-autoscale' of https://github.com/sivel/ansible into sivel-rax-autoscale 2014-06-10 09:16:02 -05:00
Paul Myjavec
267d107fe6 Docker links and required alias
If no alias is passed one will now be created for you with the same name
as the target link container, as per the documentation
2014-06-10 22:53:55 +10:00