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

194 commits

Author SHA1 Message Date
Brian Coca
99391f861d fixed doc issues on cloudformation 2015-03-31 09:09:43 -04:00
Rob Johnson
ea1ffc6d19 allow both template and template_url parameters 2015-03-30 15:27:03 +01:00
Brian Coca
d27df0cdb4 Merge pull request #334 from adamchainz/cloudformation_dont_always_need_template 
Make cloudformation module's template argument not required in case of stack deletion
 2015-03-30 08:56:56 -04:00
Brian Coca
1865ddbbdf Merge pull request #339 from lorin/instance_id 
ec2 module: add instance_id alias
 2015-03-30 08:49:07 -04:00
Mick Bass
7de97864be clean rebase of https://github.com/ansible/ansible-modules-core/pull/1024 on a new branch 2015-03-29 21:56:44 -06:00
Brian Coca
8c80900fef removed requirements/boto as it broke documentation as it is duplicated in shared aws fragements 2015-03-29 17:08:08 -04:00
Brian Coca
adfcfa4b58 Merge pull request #318 from preo/ec2-group-empty-rules 
Allow empty EC2 Security Group rules.
 2015-03-29 10:26:33 -04:00
Brian Coca
feb5144c71 Merge pull request #1021 from defionscode/s3_conn 
allow boto profile use with s3
 2015-03-29 10:08:54 -04:00
Adam Chainz
8a4e7e5d9f Make cloudformation module's template argument not required in case of stack deletion 2015-03-29 09:31:13 +01:00
Kohei YOSHIDA
8ab812c242 support secure connection on fakes3 2015-03-28 23:31:53 +09:00
Jonathan Davila
611165a77e allow boto profile use with s3 2015-03-28 10:17:12 -04:00
Lorin Hochstein
ea4d5798c7 Use the correct alias syntax 2015-03-28 09:31:52 -04:00
Lorin Hochstein
e759b4d0eb ec2 module: add instance_id alias 
Create an alias named instance_id for the instance_ids parameter.
 2015-03-28 09:31:52 -04:00
Scott Miller
13d420ebee describe choices in alias documentation 2015-03-27 16:20:20 -04:00
Brian Coca
f3e4704d92 Merge pull request #569 from 47lining/rate-throttling-retries-update 
add retry with exponential backoff when we receive throttling error code...
 2015-03-27 08:21:09 -04:00
Mick Bass
64a2077787 Add support for AWS Security Token Service (temporary credentials) to all AWS cloud modules. 2015-03-26 22:44:56 -06:00
Brian Coca
eacf4e4239 Merge pull request #269 from SDFE/rds_subnet_group_params 
use aws connect call in rds_subnet_group that allows boto profile use
 2015-03-26 15:53:33 -04:00
Toshio Kuratomi
7e7eafb3e3 Make lack of boto call fail_json instead of sys.exit 
Fixes #994
 2015-03-26 12:12:39 -07:00
Brian Coca
5d776936cc Merge pull request #256 from SDFE/route53_connect_params 
Use aws connect calls that allow boto profile use
 2015-03-26 14:34:24 -04:00
Brian Coca
68daec05f2 Merge pull request #254 from SDFE/ec2_vpc_connect_params 
use simpler ec2_connect ec2 util call
 2015-03-26 14:17:27 -04:00
Brandon W Maister
efa4d04284 Make cache_subnet_group default to empty security groups 
Since they can't be specified together, it seems like setting the
default to no security groups is the right option.
 2015-03-26 13:56:46 -04:00
Brandon W Maister
3cb2346312 Add cache_subnet_group to elasticache module 
According to the [docs] cache subnet groups are required inside a VPC.

[docs]: http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheSubnetGroups.html
 2015-03-26 13:56:46 -04:00
Brian Coca
0771dd12ca Merge pull request #1004 from bcoca/s3_fixes 
S3 fixes
 2015-03-26 12:39:36 -04:00
Brian Coca
e5ed49d6c7 added patch to workaround some s3 connection faliures 2015-03-26 11:23:32 -04:00
Brian Coca
f6c9d555a0 Merge pull request #976 from jsmartin/asg_doc_fix 
Re-wording of feature.
 2015-03-25 22:12:35 -04:00
Brian Coca
6570d48657 refactrored connection exception handling, added check to see if we actually get a connection before proceeding 
Fixes #964
 2015-03-25 21:40:13 -04:00
Sarah Zelechoski
43cd4ebd2e fix syntax in last example 2015-03-24 10:31:34 -04:00
James Martin
3bd2b7c8aa Re-wording of feature. 2015-03-20 14:59:34 -04:00
Toshio Kuratomi
5399f3744f Fix review comments from @bcoca in #745 2015-03-20 09:52:19 -07:00
Toshio Kuratomi
9e9fa6a451 Merge branch 'fix-ec2_asg' of https://github.com/m-o-e/ansible-modules-core into m-o-e-fix-ec2_asg 2015-03-20 09:43:05 -07:00
Toshio Kuratomi
a78de50801 Minor code formatting 2015-03-19 22:38:06 -07:00
Rowan Wookey
37412219d5 Fixed group name not being passed to wait_for_new_instances when replacing instances 
Fixed group_name not being passed to wait_for_elb
Minor code clean up
 2015-03-19 22:38:06 -07:00
James Martin
1c96ff32a1 check lb for instance healthy and some refactoring of rolling replace functions. 
Optionally waiting for new instances to be in viable state on ASG creation/update.

Properly updating properties and terminating group.
 2015-03-19 22:38:06 -07:00
Toshio Kuratomi
fb1c92ffa4 Merge pull request #724 from ferrants/devel-metric_alarm_fix 
check keys is in dim2 before evaluating
 2015-03-19 12:46:43 -07:00
Jaanus Torp
aca893cf43 Added support for tagging images in ec2_ami.py 2015-03-19 15:39:42 +00: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
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
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
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
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
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
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
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
James Cammarata
fafb93490c Add private_zone parameter for route53 
Fixes #473
 2015-02-26 21:35:47 -06: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
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
Bret Martin
bc0c1692b5 ec2: make group only match group names in this VPC 2015-02-19 11:28:13 -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
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
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
Matt Ferrante
e1f2c570eb check keys is in dim2 before evaluating 2015-01-29 16:36:35 -05:00
Brian Coca
e2083bbe8a corrected version added for latest features 2015-01-28 12:55:05 -05: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
6f47416cec Merge pull request #641 from ansible/fix-640 
Potential fix for 640
 2015-01-22 21:45:10 -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
Brian Coca
9e1847ed03 ec2 fix docs format 2015-01-21 20:09:46 -05: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
Alex Clifford
df2088377b ttl should always be used during a delete 2015-01-20 10:43:22 +11:00
Brian Coca
0794597c7e corrected release when this feature was added 2015-01-19 09:34:27 -05: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
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
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
Mick Bass
2d189f0d19 add retry with exponential backoff when we receive throttling error code from cloudformation 2014-12-25 14:37:08 -07: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
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