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

1036 commits

Author SHA1 Message Date
James Cammarata
49d07ca4cc Adding a note about 'type' field becoming required in rax_dns_record 2014-07-14 12:30:39 -05:00
James Cammarata
b2f09d3989 Merge branch 'rax-ptr' of https://github.com/sivel/ansible into sivel-rax-ptr 2014-07-14 12:27:46 -05:00
Matt Ferrante
66d3d75b35 Added setting of the health_check options on an existing ASG 2014-07-14 13:21:02 -04:00
James Cammarata
d52b50cb03 Merge pull request #7478 from sivel/rax-keypair-filepath 
rax_keypair module: Allow public_key to be a path to a file
 2014-07-14 10:41:38 -05:00
James Cammarata
8753849959 Merge pull request #7477 from sivel/rax-user-data 
rax module: Support config_drive and user_data
 2014-07-14 10:25:28 -05:00
James Martin
e36ef4defb Updated tag behavior. 2014-07-11 16:48:37 -04:00
Graham Mainwaring
fb83bdffa8 Fixed tracebacks when datacenter not found, when notes not given, and when collecting facts after VM creation. Fixes #8067. 2014-07-10 23:05:23 -04:00
James Cammarata
4d86bbe6dc Merge pull request #8086 from dataxu/dev-fix-typo 
Bug Fix - fixed the choices typo got the ec2_asg module
 2014-07-10 12:20:21 -05:00
James Cammarata
3a6d00f81d Add note about changing resource_tags to required in ec2_vpc 2014-07-10 12:18:35 -05:00
James Cammarata
2184b15542 Merge branch 'psa-resource-tag-required' into devel 2014-07-10 12:17:39 -05:00
Matt Ferrante
03fc2714f1 fixed the choices typo got the ec2_asg module 2014-07-10 11:01:19 -04:00
James Cammarata
3e7d91723f Adding version_added for new vm_hw_version field in vpshere_guest 2014-07-10 08:53:56 -05:00
James Cammarata
87d1cdd035 Merge branch 'fix-7206' of https://github.com/hiciu/ansible into hiciu-fix-7206 2014-07-10 08:19:05 -05:00
James Cammarata
0798f3cda4 Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848 2014-07-09 12:24:06 -05:00
James Cammarata
26707568c7 Merge branch 'issue_7906' of https://github.com/mpeters/ansible into mpeters-issue_7906 2014-07-09 12:09:40 -05:00
James Cammarata
aecd292f13 Merge branch 'resource-tag-required' of https://github.com/psa/ansible into psa-resource-tag-required 2014-07-09 11:49:41 -05:00
James Cammarata
06f72ca3b1 Merge branch 'bug/8057' of https://github.com/ericwb/ansible into ericwb-bug/8057 2014-07-08 14:38:35 -05:00
James Cammarata
0da5996bb5 Merge pull request #8049 from ranjan/dev 
Provision VM using virtual network.
 2014-07-08 10:11:18 -05:00
Joe Moretti
8357ca2b36 Add optional docker_api_version parameter to Docker Module 2014-07-08 10:06:31 -05:00
Eric Brown
cdedb0f817 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
1f2a436bbf Merge pull request #8038 from caphrim007/correct-missing-msg-argument 
Fix missing msg argument
 2014-07-05 00:30:20 -05:00
James Cammarata
ec16b18bab 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
1f813ba128 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
4a871f496a 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
9190df2aa9 Remove validation of RDS DB instance type names because Amazon frequently adds new ones 2014-07-03 15:57:28 -07:00
Ranjan Kumar
ac252ea731 Provision VM using virtual network. 2014-07-03 15:36:51 +05:30
Paul Armstrong
97b3e8c6e4 Fix for #7368 breaks peering connections. Unreak them. 2014-07-02 23:13:29 +00:00
Frédéric de Villamil
ed9c2419d1 Adds support for instance monitoring in ec2_lc module. 2014-07-02 17:08:30 +02:00
Frédéric de Villamil
3ecfbfce4b Adds the possibility to attach a public IP address to instances launched into an autoscaling group within a VPC to ec2_lc module. 2014-07-02 17:07:07 +02:00
Frédéric de Villamil
729b56cb23 Adds support for EBS optimized instances in ecl_lc module. 2014-07-02 17:07:07 +02:00
Frédéric de Villamil
00c6253c8f Adds support for IAM instance profile in ec2_lc module 2014-07-02 17:07:06 +02:00
Frédéric de Villamil
fcdafb7ff4 Adds RAM disk id support for ec2_lc module. 2014-07-02 17:07:06 +02:00
Frédéric de Villamil
c555b3a0b9 Adds support for kern_id param in ec2_ls module. 2014-07-02 17:05:52 +02:00
James Cammarata
746f52c5aa 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
0ee28c1a0e Make sure subnets and route_tables are initialized before using 
Fixes #7712
 2014-07-02 09:26:51 -05:00
Paul Armstrong
d5b6781482 Make resource_tags required and do whitespace cleanup 2014-07-01 12:33:06 -07:00
Lorin Hochstein
7413e501a1 ec2_ami_search: new EBS types 
In ec2_ami_search module, add support for the new SSD-backed EBS (ebs-ssd)
volume as well as support for provisioned IOPS (ebs-io1).
 2014-06-29 16:53:52 -04:00
Steve Zesch
16e61dc3e2 ELB enhancements 
* connection draining
* cross AZ load balancing
 2014-06-27 15:12:46 -04:00
James Cammarata
05eb6aacec 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
676f0a6e76 grammar fix 2014-06-25 14:00:01 +01:00
Stephen Paul Suarez
49cf5831c5 support old and new versions of APIError 2014-06-25 14:52:00 +08:00
Stephen Paul Suarez
dfabf2707a 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
375edbd087 Check to make sure key exists in tag list before using it 
Fixes #7910
 2014-06-24 13:54:33 -05:00
Michael Peters
45cf1dbbc5 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
126d15cc43 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
2bfdad1e86 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
eef05f7b31 Merge branch 'botify-labs-bug/fix-health-check-to-zero-bug/7898' into devel 2014-06-23 12:32:01 -05:00
Dann Bohn
677e99e375 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
1f3663b196 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
93daebe1e2 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
1c3a654912 Conditionally try to get ebs_optimized parameter from instance 2014-06-20 14:26:21 -05:00
Yap Sok Ann
f80467e013 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
1c318fa3bd Merge branch 'exit_json' of https://github.com/psa/ansible into psa-exit_json 2014-06-20 13:59:55 -05:00
Michael Peters
87a6290065 Use the right name for the vpc_id parameter 
Fixes #7853
 2014-06-20 10:49:41 -05:00
Michael Peters
3f1cf5a98a 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
3929118142 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
49fb36ef83 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
4b18c46723 Merge branch 'issue_7828_rds_param_group' into devel 2014-06-19 10:31:33 -05:00
Benno Joy
d1d96b6b50 return properties of the newly created scaling policy 2014-06-19 08:09:39 +00:00
James Cammarata
ffce57a8f6 Fixing doc typos and adding version_added for tags param in ec2_asg 2014-06-19 00:10:59 -05:00
James Cammarata
42e26987bf 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
853471f14d Handle integer param values that are calculated values 
Fixes #7828
 2014-06-19 00:04:04 -05:00
willthames
a1aec8dadd 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
ca5f1fcf03 Fixed error in docs 2014-06-18 18:29:06 +02:00
Roberto Migli
7a3c826f0c Fixed typo in docs 2014-06-18 18:22:50 +02:00
James Cammarata
b7a5ce37a4 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
50d8047c6e Fix task description 2014-06-13 15:15:29 -07:00
Matt Martz
b2d24aba61 Perform safe normalization of nics to use uuid 2014-06-13 12:17:42 -05:00
James Cammarata
1173a8d6af Catch error in azure related to a failed deployment when creating a vm 2014-06-12 10:25:31 -05:00
James Cammarata
0b8c8b0581 Merge branch 'devel' of https://github.com/matlockx/ansible into matlockx-devel 2014-06-12 09:32:03 -05:00
James Cammarata
ccf47577c4 Merge branch 'sivel-rax-autoscale' into devel 2014-06-12 08:14:39 -05:00
Peter Kolloch
7a6354f753 Hack to fix #7738: Allow tag in image parameter of docker module 
It also defaults to the "latest" tag for pulling the image
instead of pulling all versions.
 2014-06-12 11:48:57 +02:00
James Cammarata
917ad8da72 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
07e10fb9ff Merge branch 'rax-autoscale' of https://github.com/sivel/ansible into sivel-rax-autoscale 2014-06-10 09:16:02 -05:00
Paul Myjavec
074a6f3e3e 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
James Cammarata
0073b34653 Merge pull request #7259 from darKoram/nova_keypair_check_keys 
nova_keypair should fail if 'name' of key exists in keystore, but ssh hash value != public_key offered
 2014-06-09 23:53:22 -05:00
James Cammarata
150a2346c1 Merge pull request #7238 from willthames/ec2_snapshot_argument_spec 
Improve the ec2_snapshot argument spec and docs
 2014-06-09 23:51:42 -05:00
Matt Ferrante
3e875c7867 ec2_asg module enhancements 
- Added a more verbose response
  - includes its settable attributes and a list of its instances.
  - allows setting of tags, changes upon which mark the task changed
  - allow getting of information from asg module, not just setting
  - doesn't mark changed if the parameter wasn't specified
  - Availability Zones are pulled from the region
 2014-06-09 13:34:57 -04:00
Martin Joehren
98ff559fa0 azure - fixed missing return statement 2014-06-08 21:39:31 +02:00
Martin Joehren
188a13efc0 azure - fix for: temporary redirect, not deleted vhds, missing locations and role types, async api calls 2014-06-08 00:36:55 +02:00
James Cammarata
5637426f51 Merge branch 'devel' of https://github.com/ansible/ansible into devel 2014-06-06 21:56:32 -05:00
Ryan Petrello
bb0ca4c1aa Fix neutron floating IP allocation for networks with a v4 *and* v6 subnet. 
For networks that have both a v4 and a v6 subnet, the floating IP plugin
currently has two problems:

* When determining the subnet for the provided `internal_network_name`, it
assumes that the first item in the list of subnets is the one you want.
Instead, it should pick the first v4 subnet.

* When multiple fixed IP's exist for a given port (as is the case in a network
a v4 and a v6 subnet), neutron needs a hint as to which fixed IP to associate
to the floating IP address (the v4 one).
 2014-06-06 17:03:26 -04:00
James Cammarata
5bd8cd6e00 Cleaning up azure module 
* Fixed error messages to be more descriptive
* Removed direct use of subprocess module and replaced it with calls
  to module.run_command
* Changed AZURE_MANAGEMENT_CERT_PATH to be just AZURE_CERT_PATH, which
  matches what is expected by the inventory script
 2014-06-06 15:58:28 -05:00
Matt Martz
ad5cf5d55d Add Rackspace Autoscale modules 
- rax_scaling_group
- rax_scaling_policy
 2014-06-06 11:30:07 -05:00
James Cammarata
e083168773 Merge branch 'devel' of https://github.com/jwhitbeck/ansible into jwhitbeck-devel 2014-06-06 11:19:43 -05:00
James Cammarata
bd5cf57e76 Merge pull request #7653 from evanccopengeo/devel 
ec2_group: Fix for 500 error when creating new security groups
 2014-06-06 10:34:42 -05:00
James Cammarata
9cb05a0845 Catch failed connection due to a bad region in ec2_scaling_policy 
Fixes #7505
 2014-06-05 19:40:21 -05:00
James Cammarata
a760299170 Catch failed connection due to a bad region in ec2_scaling_policy 
Fixes #7506
 2014-06-05 16:44:55 -05:00
Kevin Bell
e0a4c389f3 Fixed asg instance count polling 2014-06-05 16:18:31 -05:00
Kevin Bell
426a827b46 Fix default availability zone list 2014-06-05 16:18:31 -05:00
James Cammarata
26aaa7bcdd Fix typo in nova_keypair import of exceptions from novaclient 
Fixes #7640
 2014-06-05 15:42:38 -05:00
James Cammarata
b3bbca03d5 Add additional params to get_target_from_rule method in ec2_group 
Fixes #7592
 2014-06-04 13:52:44 -05:00
James Cammarata
9f0d496d67 Fixing version_added strings for new features in ec2_elb_lb 
Fixes #7631
 2014-06-04 13:37:04 -05:00
James Cammarata
609fd2e993 Merge branch 'rax-meta' of https://github.com/sivel/ansible into sivel-rax-meta 2014-06-04 11:02:35 -05:00
evanccopengeo
fac9a64d23 fixing problem where ansible would error out because Amazon was saying the group didnt exist yet (needed to wait a few more seconds for amazon to propagate correctly) 2014-06-03 14:25:48 -04:00
Christoph Dwertmann
5cab159bda Don't use deprecated BaseException.message in keystone_user 
fixes error "failed to parse: <attribute 'message' of 'exceptions.BaseException' objects>
TypeError: <attribute 'message' of 'exceptions.BaseException' objects> is not JSON serializable"
 2014-06-02 15:11:53 +10:00
Matt Martz
7dd5b731d2 Mention that user_data can be a file path or a string 2014-06-01 14:47:01 -05:00
Matt Martz
70881d5489 Switch functions over to kwargs to make it easier to manage in the future 2014-06-01 14:45:54 -05:00
Matt Martz
4ca7840861 Add user_data and config_drive support 2014-06-01 14:42:58 -05:00
Matt Martz
84b1f21617 Add rax_meta module 
Also update rax to mirror meta value normalization from rax_meta
 2014-06-01 14:31:26 -05:00
Michael DeHaan
6bc056e012 Merge pull request #6863 from sivel/rax-untouched 
rax module: Return untouhced servers with exact_count
 2014-06-01 15:27:45 -04:00
CorbanR
42f54238e4 updating example, to be more consistent with parameter names 2014-05-30 15:57:55 -06:00
Sean Whitbeck
796d8db860 Add azure VM provisioning/termination module 2014-05-29 17:29:09 -07:00
Krzysztof Warzecha
8326b7672a vsphere_guest: Add support for setting hardware version (should fix #7206) 2014-05-30 00:01:39 +02:00
Johannes 'fish' Ziemke
352daa0138 Add networking mode parameter (net) to docker 
Since 0.11 Docker supports different networking modes (see docker run
--net). This commit add support for that to the ansible docker module.

This depends on
2d58351164
 2014-05-29 18:59:03 +02:00
Stephen Paul Suarez
2c8564e787 fix spacing 2014-05-28 06:14:54 +08:00
James Cammarata
ba641de69e Merge pull request #7536 from fly/linode-warn-ssl 
warn if remote SSL cert is not checked in linode
 2014-05-27 16:38:33 -05:00
Jon Chen
be7ff82e2d require pycurl for linode module 2014-05-27 14:37:44 -04:00
Stephen Paul Suarez
1edcee5ae8 fix typo 2014-05-27 19:19:49 +08:00
Stephen Paul Suarez
d1da454da6 support rw bind mode in docker module 2014-05-27 16:18:23 +08:00
Matt Martz
27ac5b1856 Don't fail in rax_cbs when the volume is not found 2014-05-25 19:39:43 -05:00
Matt Martz
576224e202 Add PTR record support to rax_dns_record 2014-05-22 18:12:56 -05:00
Michael DeHaan
ee82681d14 Merge pull request #7501 from sivel/rax-dns-serial-doc 
Add notes to rax_dns and rax_dns_record to recommend using serial: 1
 2014-05-22 14:10:43 -04:00
Matt Martz
413243186d Add notes to rax_dns and rax_dns_record to recommend using serial: 1 2014-05-22 11:58:28 -05:00
Matt Martz
73c67cea91 Allow public_key to be a path to a file 2014-05-21 12:28:18 -05:00
Atlas Health
26c2491583 Stopped instances can also be terminated 2014-05-21 07:18:30 -07:00
Andrew Snare
0cc6c479bc Support internal-only ELBs in EC2. 2014-05-20 22:21:14 +02:00
Matt Bray
8363ab5a6f docker: fix targetting images by name 2014-05-15 15:04:30 +01:00
willthames
551adfa26e Fix parameters check for ec2_vol 
Split the error check into two error checks and delay the
checks so that listing existing volumes works more nicely.

The error check should check that:
* One and only one of volume_size id or name is set

This fix adds the 'only one' part of that check and provides
more useful error messages.
 2014-05-15 12:31:13 +10:00
James Cammarata
67d8df0e32 During vsphere config check attempt cast before marking values missing 
Fixes #7385
 2014-05-14 15:57:26 -05:00
James Cammarata
154ef942eb Merge pull request #7404 from jimi-c/issue_7363_docker_names 
Make sure the docker data has a "Names" field before using it
 2014-05-14 14:44:16 -05:00
Konstantin Shabanov
ad9225895b Fix env splitting in docker module 
ENV variable value could contain '=' (for example mysql://host/db?pool=10)
 2014-05-14 18:11:43 +04:00
Atlas Health
342fef79a1 set type and default value 2014-05-13 22:00:22 -07:00
James Cammarata
19dbff916f Correctly cast the size_gb value for vpshere disks 
Fixes #7385
 2014-05-13 15:13:13 -05:00
Carson Gee
e6fbd2d8cb Fix missing variable initialization so an unspecified internal_network runs 2014-05-13 09:56:13 -04:00
Matt Martz
92b77048dc Handle ValueError during json.loads of json data from build 2014-05-12 14:16:07 -05:00
James Cammarata
bfc1201ecd Make sure the docker data has a "Names" field before using it 
Fixes #7363
 2014-05-12 12:27:07 -05:00
James Cammarata
62c4a15c73 Merge pull request #7346 from tongpu/devel 
Add documentation for required parameter name to quantum_subnet
 2014-05-09 16:21:28 -05:00
Johannes 'fish' Ziemke
ea71c0c317 Fix: Remove check for Ghost state 
This fixed the just committed change handling non existent Ghost state.
 2014-05-09 20:13:25 +02:00
James Cammarata
c97dec9d75 Merge pull request #7338 from discordianfish/remove-ghost-state 
Remove check for Ghost state
 2014-05-09 13:06:16 -05:00
Johannes 'fish' Ziemke
b9d9ef511f Remove check for Ghost state 
This doesn't exist anymore and causes ansible to throw a KeyError
 2014-05-09 18:07:02 +02:00
Lukas Grossar
0aa4cb9a79 Add documentation for required parameter name to quantum_subnet 2014-05-09 15:17:04 +02:00
Herby Gillot
efbe4ca8d5 rds module: Fix undeclared reference to "params" when setting password in 
modify mode.
 2014-05-09 05:49:11 -04:00
James Cammarata
5c7109b8b9 Merge pull request #7110 from orgoj/docker-patch-version_comment 
module docker - add docker version comment
 2014-05-09 00:57:41 -05:00
James Cammarata
0215134907 Fixing a doc mistake in the ec2 module from 4269bb6 2014-05-09 00:21:35 -05:00
James Cammarata
48e2a5e5a2 Merge branch 'ec2-start-stop' of https://github.com/sayap/ansible into sayap-ec2-start-stop 2014-05-09 00:04:34 -05:00
Yap Sok Ann
4269bb6a45 ec2: Fix bug with running/stopped state and wait=yes. 
If `get_all_instances` returns multiple reservations, the old wait loop only
dealt with the first reservation. Thus, the wait loop may end before all
instances get to be running/stopped.

Also clean up the code a little.
 2014-05-09 11:35:48 +08:00
James Cammarata
9d3583cab3 Merge pull request #7055 from bpennypacker/rds_modify 
cloud/rds : renaming an rds instance always fails
 2014-05-08 21:10:47 -05:00
James Cammarata
ebac5dfbce Updating docstring for docker_image based on new default for tag 2014-05-08 21:04:55 -05:00
James Cammarata
34e52c5884 Merge branch 'docker_image-patch-notag' of https://github.com/orgoj/ansible into orgoj-docker_image-patch-notag 2014-05-08 21:03:57 -05:00
James Cammarata
39433949e0 Merge branch 'elb_subnets' of https://github.com/jimbydamonk/ansible into jimbydamonk-elb_subnets 2014-05-08 19:28:54 -05:00
James Cammarata
3ac4943751 Some cleanup for the rds/vpc_security_groups fix 2014-05-08 15:08:43 -05:00
James Cammarata
768de238d4 Merge branch 'vpc_fix' of https://github.com/ebrevdo/ansible into ebrevdo-vpc_fix 2014-05-08 14:39:07 -05:00
napkindrawing
011ec5d9e6 Fix to unescape * was discarded by unescape of @ 
`decoded_name` was created twice, each from `rset.name`

So, the second call to `.replace(r'\100', '@')` overwrites decoded_name, discarding the result of the call to `.replace(r'\052', '*')`

I had a problem with wildcard domains that was fixed by this patch.
 2014-05-08 14:20:32 -04:00
Paul Armstrong
7d28f30bda Add proper state output to ec2_asg, ec2_metric_alarm, ec2_scaling_policy 2014-05-08 15:51:07 +00:00
James Cammarata
713657d684 Make sure the default ec2_group egress rule is not removed 
Upon a second run, the default egress rule will be removed when a
vpc is specified but no other egress rules were set. This patch
corrects that behavior by removing the default egress rule from the
list of unmatched outbound rules.

Fixes #7309
 2014-05-07 20:52:03 -05:00
Maykel Moya
1d3ce41e83 Fix typo 2014-05-07 10:35:16 +02:00
James Cammarata
d6fc9f1dfc Fixing two bugs in the ec2_elb_lb module 
* the current state of the ELB was not reflected properly when checking
  the status after a change was made.
* invalid zones caused a traceback when enabling/disabling zones
 2014-05-05 12:48:45 -05:00
James Cammarata
faf733bc49 Removing zone choices that overly-limit available zones for gce 
Fixes #7270
 2014-05-05 11:58:39 -05:00
Kesten Broughton
aee1a97102 if key name already exists on tenant, check if public_key is offered that it matches the existing key 2014-05-02 11:09:54 -05:00