Commit graph

576 commits

Author SHA1 Message Date
Rob
5a6599d70d Move import statements for easier debugging (correct line numbers) 2015-10-08 14:03:40 +11:00
Brian Coca
9eb0c178ec Merge pull request #725 from robbwagoner/cloudformation-resources
module cloudformation: include a CFN stack's resources in the result
2015-10-07 21:35:39 -04:00
Brian Coca
692781c936 Merge pull request #2070 from fvant/patch-7
We are copying from S3,  the bucket is the source, not the target.
2015-10-07 21:34:48 -04:00
Brian Coca
7af7ef2ef7 Merge pull request #2086 from wimnat/feature/issue-2085
Remove 'str' type so that json is properly quoted
2015-10-07 21:34:00 -04:00
Brian Coca
547690c785 Merge pull request #2169 from stelligent/devel
Replaces 'old' get_ec2_creds connection method with get_aws_connection_info
2015-10-07 21:26:14 -04:00
Brian Coca
c4f64d822c changed modules to use common ec2 docs for region 2015-10-07 16:16:24 -04:00
fperks
7fd3262c3c Fix error on ec2 status change
Both `source_dest_check` and `termination_protection` variables are not
available within the scope of the startstopec2 instance method. This just
pulls them from module.params.
2015-10-07 13:43:57 -04:00
Gilad Peleg
5f914e854b Add state=running on some ec2 examples
`state=running` was missing in some of the ec2 module examples
2015-10-07 14:49:05 +03:00
Rob
ca517abf07 Set default of dimensions parameter to be empty dict 2015-10-07 13:54:00 +11:00
Kai Webber
d0b30dd86d Added launch group support for ec2 module 2015-10-06 20:26:10 +03:00
James Cammarata
a3e7f5cfcc Merge pull request #2062 from wimnat/feature/iam_policy_doc_fix
Update iam_policy.py doc and state default parameter
2015-10-05 16:53:14 -04:00
Gerard Lynch
8b1ee3d6cb minor doc fix 2015-10-04 17:32:12 +01:00
Brian Coca
da220e0bb0 added version_added 2015-10-01 00:13:58 -04:00
Nathaniel Felsen
8ec17d0fd9 Adding support for access logs in ELB 2015-09-30 18:02:47 -07:00
Alex Kessinger
4308ae25c4 Fix a argument mismatch in elasticache
I think in this commit 720aeffca2

There was bug introduced where the ElastiCacheManager init method has
a number of positional arguments like so.

```py
    def __init__(self, module, name, engine, cache_engine_version, node_type,
                 num_nodes, cache_port, parameter_group, cache_subnet_group,
                 cache_security_groups, security_group_ids, zone, wait,
                 hard_modify, region, **aws_connect_kwargs):
```

But then later in the code the positional arguments are passed in
like this.

```py
    elasticache_manager = ElastiCacheManager(module, name, engine,
                                             cache_engine_version, node_type,
                                             num_nodes, cache_port,
                                             cache_subnet_group,
                                             cache_security_groups,
                                             security_group_ids, parameter_group, zone, wait,
                                             hard_modify, region, **aws_connect_kwargs)
```

If you count, you can see that cache_subnet_group, is being passed in
where the manager expects to see parameter_group.
2015-09-29 16:51:26 -07:00
Brian Coca
653b55bf68 Merge pull request #2160 from j-carl/fix_amazon-cloudformation-userdir
Fix to handle user directory within parameter 'template'.
2015-09-28 15:23:19 -04:00
Jens Carl
dc109387bd Change type of parameter 'template' to 'path'. 2015-09-28 18:25:23 +00:00
Shayne Clausson
841835ebac Replaces 'old' get_ec2_creds connection method with get_aws_connection_info to
support passing in security_token for temporary creds.
2015-09-28 19:50:02 +02:00
Toshio Kuratomi
a4ac171a07 Merge pull request #2124 from halberom/ec2_adjust_vol_handling
ec2 - allow use of volume_type in volumes dict
2015-09-28 09:04:12 -07:00
Gerard Lynch
1857263b63 allow use of volume_type in volumes dict 2015-09-28 17:02:46 +01:00
Toshio Kuratomi
d5f62798f0 Docs fixes 2015-09-28 08:22:36 -07:00
Toshio Kuratomi
6cad03644f Merge pull request #2130 from shawnsilva/modify-rds-size
Fix for modifying the size of an RDS instance.
2015-09-28 07:38:43 -07:00
Toshio Kuratomi
3b5f232d4d Merge pull request #2143 from atplanet/ec2-ami-mod-clarify-block-device-mapping
Clarify available options for device_mapping parameter of ec2_ami module
2015-09-28 07:28:08 -07:00
Jens Carl
e25605cd5b Fix to handle user directory within parameter 'template'. 2015-09-25 21:59:14 +00:00
Tom Bamford
4e1d28e311 Clarify available options for device_mapping parameter of ec2_ami module 2015-09-24 12:37:03 +00:00
Shawn Silva
ba8930c83a Fix for modifying the size of an RDS instance.
When attempting to modify the size of an RDS instance Ansible succeeds and
returns a "changed" status. However, no changes are applied to the RDS
instance. Boto is looking for a keyword parameter of "allocated_storage" to
update the size, and this parameter wasn't being included.
2015-09-22 10:46:20 -04:00
Selivanov Pavel
ec24a86f69 ec2_group.py: added ICMP rule example 2015-09-22 16:56:13 +03:00
Brian Coca
8b7e692494 Merge pull request #1353 from awesomescot/devel
adding parameter group option
2015-09-21 08:31:40 -04:00
EC
9168ed4736 Fixing ec2_asg termination_policy
If this isnt set, it wont launch the instances because it needs to default to "Default" despite what boto docs say.
2015-09-17 15:47:16 -04:00
Rob
9bf0d06e4a Update iam_policy.py
Fixed doc for policy_name - it is a required field
Removed empty aliases
2015-09-17 17:52:42 +10:00
Gerard Lynch
3d12e53a28 order params, add missing tag param. update examples 2015-09-16 11:29:36 +01:00
whiter
719f68e057 Remove 'str' type so that json is properly quoted 2015-09-16 17:52:43 +10:00
Toshio Kuratomi
636eecf354 Fix improper indentation 2015-09-15 14:25:22 -07:00
Brian Coca
367b4f07a1 Merge pull request #2047 from tomfotherby/patch-1
Allow load_balancer_port as a Ansible variable
2015-09-15 11:15:36 -04:00
Brian Coca
4a8a54950c Merge pull request #2067 from wimnat/feature/issue-2066
Add exception handling to iam
2015-09-15 10:46:26 -04:00
James Cammarata
8125ae624a Merge pull request #2075 from evanccnyc/ec2_asgfix
fixing termination policies for ec2_asg
2015-09-15 10:29:34 -04:00
Evan Carter
2e84bb9c99 fixing termination policies for ec2_asg 2015-09-14 18:31:22 -04:00
Brian Coca
8a7946b91d Merge pull request #2064 from wimnat/feature/issue-2063
Remove unnecessary json.loads
2015-09-14 16:46:34 -04:00
Evan Carter
70ed99ec26 Fixing bug #2058 and adding some backwards compatibility 2015-09-14 11:27:37 -04:00
Frank van Tol
a7667fcaf2 Update s3.py
We are copying from S3,  the bucket is the source, not the target.
2015-09-14 15:57:48 +02:00
Rob
da29956f03 Add exception handling to iam 2015-09-14 15:43:49 +10:00
wimnat
8e9c85bed2 Remove unnecessary json.loads 2015-09-14 14:23:34 +10:00
Tom Fotherby
54ae73b1a3 Fix #1984 - allow load_balancer_port as a variable 2015-09-10 17:34:38 +01:00
Brian Coca
05c3b3ea15 minor doc fix 2015-09-10 09:07:59 -04:00
Brian Coca
951f5807b9 Merge pull request #2028 from rosmo/s3-permissions
Added option to set multiple ACLs for S3 objects
2015-09-09 08:40:30 -04:00
Taneli Lepp
15f4b59619 Added option to set multiple ACLs for S3 objects. Also verifies the
selected permissions against Boto's canned ACL strings list.
2015-09-08 20:00:14 +03:00
Brian Coca
c4140cc6db Merge pull request #2021 from h3biomed/enis_at_launch
ec2: allow ENIs to be specified at instance launch
2015-09-08 12:45:05 -04:00
Yanchek99
7104096c7c Fixed typo for instance_tags documentation 2015-09-08 09:16:53 -07:00
Bret Martin
27e9318ffe Use general-purpose parameter mutual exclusion code for network_interfaces 2015-09-06 14:00:35 -04:00
Bret Martin
44f3618dd3 Add alias network_interface and accept a string for a single ENI 2015-09-06 13:53:28 -04:00
Bret Martin
5db3f14e94 Add network_interfaces example 2015-09-06 13:18:20 -04:00
Bret Martin
a20a78a50c Remove aliases specification from documentation since there are none 2015-09-06 13:03:04 -04:00
Brian Coca
f1efc121ee corrected whitepace 2015-09-06 11:18:47 -04:00
Toshio Kuratomi
34655e8e29 correct documentation formatting 2015-09-05 08:56:02 -07:00
Bret Martin
eaa45dcbd9 Add network_interfaces parameter to ec2 module to support launch-time ENIs 2015-09-04 19:44:35 -04:00
Toshio Kuratomi
2520627fe7 Make sure listener ports are ints.
May fix #1984
2015-09-03 08:47:27 -07:00
Benno Joy
2f42cd4b2c Merge pull request #1951 from galindro/ec2_asg_termination_policies
Added termination_policies option
2015-09-03 17:35:06 +05:30
Benno Joy
26928dd7c6 Merge pull request #1990 from rickmendes/usability-enhancements
using single device_id and enabling release on disassociation
2015-09-01 18:00:11 +05:30
Benno Joy
b5db274362 Merge pull request #1940 from jcowley/s3-permissions
Add support for S3 canned permissions. resolves #1939
2015-09-01 09:15:15 +05:30
Toshio Kuratomi
06fc029f73 Remove non-ascii quote char 2015-08-31 15:09:50 -07:00
Rick Mendes
a18c96882e using single device_id and enabling release on disassociation 2015-08-31 09:06:18 -07:00
Benno Joy
66288d48a2 Merge pull request #1703 from haad/ec2_start_stop_by_tag
Rebase start/stop by instance tag
2015-08-27 14:46:54 +05:30
Benno Joy
512b485a90 Merge pull request #1871 from evanccnyc/devel
Adding the ability to associate eips with network interfaces on Amazon EC2
2015-08-27 13:51:28 +05:30
Timothy Appnel
2ba32a8b10 Clarified and cleaned up grammar of error messages. 2015-08-26 11:59:31 -04:00
Timothy Appnel
0e42b1708b Fixed call to undefined attribute when RDS module timeouts waiting. 2015-08-26 11:58:16 -04:00
Brian Coca
116793889f Merge pull request #1915 from leedm777/patch-1
ec2_vol: Added missing "needs 2.0" doc
2015-08-24 18:44:15 -04:00
Till Backhaus
39e7e05a8d Delete dead and broken code 2015-08-24 20:06:53 +02:00
James Cammarata
85ddb1b902 Fixing region requirement regarding euca clusters
Fixes ansible/ansible#11023
2015-08-22 12:32:40 -04:00
Bruno Galindro da Costa
f7f621839a Added termination_policies option 2015-08-21 14:13:09 -03:00
Sarah Haskins
b04efa22c4 Expose cache_parameter_group_name in elasticache module
The cache_parameter_group_name was not previously exposed in
elasticachy.py, I have exposed it, as optional.
2015-08-21 11:33:28 -04:00
Jason Cowley
8215aad3b3 Add support for S3 canned permissions. resolves #1939 2015-08-19 11:40:07 -07:00
HAMSIK Adam
dfac073343 Rebase start/stop instance pull code 2015-08-18 14:32:48 +02:00
David M. Lee
6a8108133d ec2_vol: Added missing "needs 2.0" doc
The ability to find-or-create a volume was added in 2.0. Added note to
the example.
2015-08-14 13:01:44 -05:00
Michael J. Schultz
63d7bbea19 Return an iterable instead of None
By default `.get()` will return `None` on a key that doesn't exist. This
causes a `TypeError` in the `for` loop a few lines down. This change simply
returns an iterable type to avoid the error.
2015-08-12 12:13:29 -05:00
Toshio Kuratomi
dea5f5d15e Another way that the serialization of the boto results can fail 2015-08-07 12:27:57 -07:00
Toshio Kuratomi
4c622a0338 Another launchconfig field needs to be explicitly converted for json serialization
Fixes #1848
2015-08-06 08:41:23 -07:00
HAMSIK Adam
f4228d81d2 Convert enabled value to boolean to actually work, make sure we can set expiration period to 0(None) to disable it 2015-08-06 16:51:36 +02:00
Brian Coca
016b4ede2e minor doc fix 2015-08-05 17:36:16 -04:00
Evan Carter
06e722900e Adding the ability to associate eips with network interfaces 2015-08-05 14:34:33 -04:00
Ted Timmons
40519de8e7 fix ugly documentation
current version dumps a character per line in the docs: http://docs.ansible.com/ansible/cloudformation_module.html
2015-08-01 17:30:15 -07:00
Robert Jailall
d10f3f7a7e Refactor ec2_snapshot to make it more testable 2015-08-01 08:11:17 -07:00
Hagai Kariti
1f447ad5ba made wait default to True in ec2_snapshot 2015-08-01 07:54:15 -07:00
Hagai Kariti
a91db23b56 Add to the ec2_snapshot module the ability to create a snapshot only if one hasn't recently been created
- Added snapshot_max_age parameter
- Updated docs
- Made the default value of wait to be false, as it used to be
2015-08-01 07:54:15 -07:00
Toshio Kuratomi
42d3d02855 Merge pull request #51 from cewood/ec2-group/cidr-ip-list
Support specifying cidr_ip as a list
2015-08-01 07:45:38 -07:00
Toshio Kuratomi
be468ff9d3 result is now a dict and so needs different access syntax
Fixes #1848
2015-07-31 20:58:04 -07:00
Toshio Kuratomi
4928357667 Remove unneeded urllib2 import 2015-07-31 20:58:04 -07:00
Brian Coca
1268a83eb7 Merge pull request #1782 from civisanalytics/iam_dont_delete_passwords_silently
iam: don't delete passwords by default
2015-07-30 19:51:57 -04:00
James Cammarata
79f21c6ec9 Fix missing params to download_s3file in s3 2015-07-30 14:49:45 -04:00
Brian Coca
697307f88c Merge pull request #1670 from mikeputnam/issue-1643-gpl-header
Add missing GPLv3 License header
2015-07-30 14:39:44 -04:00
James Cammarata
4c4e978360 Fixing s3 failures when bucket names contain dots 2015-07-30 13:47:01 -04:00
Brian Coca
d6b9989c71 Merge pull request #1820 from jaimegago/patch-1
Fix example indentation bug
i seem to have misread the patch, i thought it was doing the contrary of what it was. Sorry, merging it in now.
2015-07-30 09:52:00 -04:00
Cameron Wood (@cewood)
4241d940b7 Support specifying cidr_ip as a list
Update/fix to Support specifying cidr_ip as a list

Unicode isn't compatible with python2, so we needed some other
solution to this problem. The simplest approach is if the ip item
isn't already a list, simply convert it to one, and we're done.
Thanks to @mspiegle for this suggestion.
2015-07-29 19:11:43 +10:00
Luke Rohde
88a0d79873 Use msg kwarg to pass error message in ec2_snapshot 2015-07-28 16:02:49 -04:00
Brian Coca
92f32a0253 added version added to headers in s3 2015-07-28 14:50:39 -04:00
Brian Coca
8227b48a6a minor doc fixes 2015-07-28 14:50:01 -04:00
Brian Coca
4b78b5597f Merge pull request #160 from acaire/s3-headers
S3 headers
2015-07-28 14:48:51 -04:00
Jaime Gago
1f62f5f580 Fix example indentation bug 2015-07-27 23:40:49 -07:00
Brian Coca
cb90735b2a Merge pull request #1795 from feanil/feanil/s3_overwrite_early
If overwrite is set, download eagerly.
2015-07-27 22:34:58 -04:00
Brian Coca
f4a17b3e97 Merge pull request #1802 from bcoca/ec2_fixes
ec2 fixes
2015-07-27 15:48:02 -04:00
Toshio Kuratomi
8a9405a55b Convert object into dict so it will turn into json properly 2015-07-27 11:04:58 -07:00
Brian Coca
481f300836 clarified error messages to actually give back ansible module option instead of internal boto field name 2015-07-24 23:32:41 -04:00
Jens Carl
fd0fc5131c Fix missing alias "groups". 2015-07-24 22:06:56 +00:00
Scot Spinner
abf2083671 one thing missed 2015-07-24 14:11:53 -07:00
Scot Spinner
b47bbfad1b merging with ansible devel 2015-07-24 14:10:20 -07:00
Feanil Patel
22461e335a If overwrite is set, download eagerly.
If the we are going to overwrite the file anyway,
there is no need to do any checksums locally or
grab the remote etag.
2015-07-24 10:44:05 -04:00
khassen
5f2b365faa Use the common/shared MD5 function. 2015-07-23 13:58:43 -07:00
Brian Coca
cfe697f676 Merge pull request #1775 from arcz/patch-1
Fix typos in route53.py
2015-07-22 16:47:18 -04:00
billwanjohi
99e3881a7c iam: don't delete passwords by default 2015-07-22 20:46:42 +00:00
Toshio Kuratomi
222927256d Remove validate_certs as the url is not user settable so we always want to validate the certificate 2015-07-22 07:09:51 -07:00
Artur Cygan
2133cb1171 Update route53.py
Fix typos
2015-07-22 11:36:32 +02:00
Baraa Basata
dc9dfa9ef8 Fix iam_policy example 2015-07-22 00:03:33 -04:00
Brian Coca
55bc9e8fb1 added rickmendes as maintainer 2015-07-20 22:37:02 -04:00
ayush
3f7313cc43 Updated doc strings so each character isn't considered a line 2015-07-20 17:05:10 -07:00
Toshio Kuratomi
01f8a99509 Deprecated _ec2_ami_search now verifies SSL certificates 2015-07-20 13:38:37 -07:00
Brian Coca
5fcc0be25b Merge pull request #1740 from bcoca/ec2_key_check_fix
attempt to fix check mode when state='absent'
2015-07-18 23:13:03 -04:00
Brian Coca
db19999185 minor doc fixes, version added for latest feature 2015-07-17 23:13:21 -04:00
Brian Coca
ab9d4eb25d Merge pull request #146 from axialops/rds-reboot
rds module: add command to reboot RDS instance
2015-07-17 23:09:07 -04:00
Herby Gillot
048cfb857d rds: add the ability to reboot RDS instances 2015-07-17 21:09:34 -04:00
Brian Coca
5650ed7ec3 Merge pull request #1476 from haad/ec2_elb_lb_sg_name
Add security_group_names paramter to ec2_elb_lb
2015-07-17 20:31:09 -04:00
Brian Coca
e75235c063 Merge pull request #1628 from wimnat/feature/ec2_vpc_net
ec2_vpc_net refactor
2015-07-17 17:01:49 -04:00
Eero Niemi
3533f39534 Fixed parameter validation when creating a volume from a snapshot 2015-07-17 16:54:39 +03:00
whiter
dc71c04827 Added 'resource_tags' alias 2015-07-17 15:54:17 +10:00
Brian Coca
24c2bccd66 corrected version_added 2015-07-17 01:11:18 -04:00
Brian Coca
a9e8cae82e attempt to fix check mode when state='absent' 2015-07-16 11:37:22 -04:00
HAMSIK Adam
e3d4256283 Use mutually_exclusive in AnsibleModule 2015-07-15 10:45:38 +02:00
HAMSIK Adam
6d6da470c8 Fix missing , 2015-07-15 10:41:14 +02:00
HAMSIK Adam
959c65c7e0 Add version 2015-07-15 10:41:14 +02:00
HAMSIK Adam
985cdf2c28 Add module parameter for security group name. This make ec2_elb_lb module consitent with others 2015-07-15 10:41:14 +02:00
Brian Coca
b80ec0a335 fixed minor doc issues 2015-07-14 16:55:21 -04:00
Brian Coca
e1067ef670 Revert "Revert "ec2_lc - include all launch config properties in the return"" 2015-07-14 12:02:03 -04:00
Brian Coca
01d4c432b0 Revert "ec2_lc - include all launch config properties in the return" 2015-07-14 11:39:40 -04:00
Frank van Tol
300656ca07 Remove default port value, it does not work in _requires_destroy_and_create logic
When creating a Redis cluster, every run it gets destroyed and recreated because the port number of memcached is used as the default.
2015-07-13 17:21:16 +02:00
Frank van Tol
a85640c368 Update elasticache.py 2015-07-13 16:52:30 +02:00
Frank van Tol
a7f33ee533 Remove default for engine_version
Redis and memcached have different engine version numbering, there can not be a shared default value.
2015-07-13 16:45:41 +02:00
Benno Joy
63fa06f477 Merge pull request #1385 from joelthompson/devel
Adding ability to filter AWS Route 53 private hosted zones by attache…
2015-07-12 16:36:59 +05:30
Brian Coca
b38f0a34d2 Merge pull request #1702 from askulkarni2/devel
s3 module: Add missing version tag to "encrypt" parameter
2015-07-10 20:44:19 -04:00
Brian Coca
fb260f4cc2 Merge pull request #1698 from evanccnyc/devel
Adding default cooldown to AWS ASG
2015-07-10 20:21:20 -04:00
Apoorva Kulkarni
c0e4c50eeb s3 module: Add missing version tag to "encrypt" parameter 2015-07-10 14:56:34 -07:00
Joel Thompson
10df7b97ee Adding ability to filter AWS Route 53 private hosted zones by attached VPC 2015-07-10 13:51:33 -04:00
Evan Carter
68bd17b15e Adding default cooldown to AWS ASG 2015-07-09 15:29:00 -04:00
vanga
164043bd6d Throw error if encryption is set while passing a snapshot id 2015-07-09 20:42:54 +05:30
Brian Coca
5ec040a1d2 Merge pull request #1680 from Pallokala/topic_ec2_volume_default_encryption_flag_value_to_None
Change the default flag value to None to prevent AWS complaining: "In…
2015-07-08 22:36:13 -04:00
Brian Coca
12fbc4712f Merge pull request #1646 from flyte/rds2-snapshot-on-delete
Provide correct kwargs to rds2 connection when making a final snapshot
2015-07-07 10:23:57 -04:00
Juho-Mikko Pellinen
b4911a47d1 Change the default flag value to None to prevent AWS complaining: "Instance creation failed => InvalidBlockDeviceMapping: the encrypted flag cannot be specified since device /dev/sda1 has a snapshot specified." 2015-07-07 16:31:47 +03:00
Juho-Mikko Pellinen
041dc8b587 Remove empty aliases 2015-07-06 13:08:46 +03:00
Juho-Mikko Pellinen
228c03bd67 Add version number 2015-07-06 13:07:33 +03:00
Juho-Mikko Pellinen
f0ad6c5a1f Fix hosted_zone_id after rebase. 2015-07-06 13:02:24 +03:00
Juho-Mikko Pellinen
71ebe6321b Add support for specifying unique hosted zone identifier 2015-07-06 11:31:02 +03:00
Juho-Mikko Pellinen
110f618487 Add support for specifying unique hosted zone identifier 2015-07-06 11:29:03 +03:00
Brian Coca
52543435d6 Merge pull request #1562 from micxer/iam_policy-json-string
Add the option to pass a string as policy
2015-07-04 19:11:34 -04:00