Commit graph

671 commits

Author SHA1 Message Date
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
Brian Coca
981f0ad481 Merge pull request #1635 from smiller171/devel
update docs for cloudformation
2015-07-04 16:19:28 -04:00
Scott Miller
c3c2e6ab72 Update cloudformation.py
Fix for inaccurate phrasing
2015-07-04 14:45:21 -04:00
Mike Putnam
6c0e264806 Add missing GPLv3 License header
Fixes #1643
2015-07-03 22:57:53 -05:00
Brian Coca
17bb405578 Merge pull request #1659 from mikeputnam/fix-docs-descrepancy
Upstream docs show launch_config_name as required.
2015-07-03 22:46:49 -04:00
Toshio Kuratomi
ac3024e57e Merge pull request #1620 from robbwagoner/ec2_elb_lb_instances
return health of instances and counts
2015-07-02 10:58:02 -07:00
Robb Wagoner
8f0d462fd0 remove double dict & fix increment bug 2015-07-02 06:16:43 -07:00
Flyte
3d9a8caa59 Provide correct kwargs to rds2 connection when making a final snapshot 2015-07-02 09:32:10 +01:00
whiter
ee782d822b Fixed dicts comparison for tags 2015-07-02 15:24:39 +10:00
Mike Putnam
5c17a99a1c Upstream docs show launch_config_name as required.
http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_AutoScalingGroup.html

Fixes #11209

Ansible behavior is correct, this commit just updates the docs to
reflect that correctness.
2015-07-01 20:58:17 -05:00
Matt Ferrante
8cb4b7b01c ec2_ami can update an ami's launch_permissions 2015-07-01 17:46:13 -04:00
Toshio Kuratomi
c71f85377d Merge pull request #1637 from defionscode/quick_iam_patch
no_log to iam password
2015-07-01 08:13:44 -07:00
Toshio Kuratomi
8f13f8851f Merge pull request #1582 from evanccnyc/devel
Add ClassicLink settings to EC2_launchconfig
2015-07-01 07:49:20 -07:00
Toshio Kuratomi
8f74a73713 Merge pull request #1561 from micxer/iam_policy-fix
Fix connection creation in iam_policy module to allow usage of profiles with boto
2015-06-30 13:39:32 -07:00
Ash Caire
3ccf2e8a86 add headers param to s3 uploads 2015-06-30 23:04:15 +10:00
Toshio Kuratomi
406402bb26 Merge pull request #332 from proby/add-s3-list
Add support for listing keys in a specific S3 bucket
2015-06-30 04:58:58 -07:00
Michael Weinrich
4da3a724f1 Fix connection creation to allow usage of profiles with boto 2015-06-30 08:51:36 +02:00
Brian Coca
79ad99bc67 Merge pull request #497 from robbwagoner/ec2_lc_user_data
ec2_lc - include all launch config properties in the return
2015-06-30 00:26:38 -04:00
Brian Coca
8b290c6274 Merge pull request #831 from j-carl/feature-route53-nameserver
List the name servers of a zone. Fixes #801
2015-06-30 00:11:11 -04:00
Toshio Kuratomi
7edacf6b1c Use module.fail_json() instead of sys.exit() 2015-06-29 13:26:21 -07:00
Jonathan Davila
def5fdcb21 no_log to iam password 2015-06-29 15:14:50 -04:00
Scott Miller
692045f693 update docs for cloudformation 2015-06-29 14:15:23 -04:00
whiter
786ec1dca1 ec2_vpc_net refactor 2015-06-29 09:32:45 +10:00
Robb Wagoner
5e674ddcfc include all launch config properties in the return
make all properties available when registering the result
which is useful when wanting to launch a stand-alone instance based upon
an existing Launch Config.
2015-06-26 15:51:41 -07:00
Robb Wagoner
d651b41691 return health of instances and counts 2015-06-26 15:39:08 -07:00
Brian Coca
e864576f14 Merge pull request #1133 from defionscode/ec2_vpc2
New vpc module. does not contain subnet or route table functionality.
2015-06-26 16:15:15 -04:00
Patrick Roby
e90d02c35c iterate through all keys in a more pythonic manner 2015-06-25 10:37:17 -07:00
Patrick Roby
8ba96aaf4b update documentation, adding new params 2015-06-25 10:36:07 -07:00
Toshio Kuratomi
f42fed3d70 Merge pull request #1587 from micxer/iam-fix
Use aws connect calls that allow boto profile use
2015-06-25 08:23:54 -07:00
Toshio Kuratomi
d824a7a9f5 Merge pull request #255 from SDFE/s3_connect_params
Use aws connect calls that allow boto profile use
2015-06-25 08:23:15 -07:00
Patrick Roby
00322c43fc Add support for listing keys in a specific S3 bucket
Includes support for specifying a prefix, marker, and/or max_keys. Returns a list of key names (as strings).
2015-06-24 12:18:23 -07:00
James Cammarata
65c63b3afa Updating version_added for new spot_type param in ec2 module
Also made sure 'choices' were set on the module param, to catch errors
in user's playbooks, etc.
2015-06-24 14:43:04 -04:00
Jay Taylor
dbed8cee3b Added support for spot request type specification (to support persistent spot requests). 2015-06-24 08:23:52 -07:00
Evan Carter
73d5a8a63a Fixing typo 2015-06-24 11:05:37 -04:00
Michael Weinrich
559ad374f5 Add the option to pass a string as policy 2015-06-24 12:03:01 +02:00
zimbatm
29b00ba526 route53: add support for routing policies
It is now possible to pass various routing policies if an identity is
provided.

This commit also introduces multiple optimisations:
* Only fetch records for the given domain
* Use UPSERT instead of DELETE+CREATE to update existing records
2015-06-24 10:43:49 +01:00
Michael Weinrich
56d4f21c5f Use aws connect calls that allow boto profile use 2015-06-24 11:20:47 +02:00
Benno Joy
3d8bf111b5 Merge pull request #1583 from civisanalytics/iam_accept_sts
iam: use modern helper to allow sts
2015-06-24 09:18:49 +05:30
Benno Joy
54bfdee1e0 Merge pull request #1494 from toninog/devel
fixes to iam group variables and delete group fixes
2015-06-24 08:32:47 +05:30
Benno Joy
80622a005d Merge pull request #918 from defionscode/iam_cert
iam certificate module
2015-06-24 08:29:33 +05:30
billwanjohi
33533eb156 iam: use modern helper to allow sts
previous implementation ignored the session token when present
2015-06-23 18:42:30 +00:00
Jonathan Davila
7dac96e41b iam certificate module
boto import tweak

style patch
2015-06-23 14:41:18 -04:00
Jonathan Davila
c6f9e08282 new vpc module. does not contain subnet or route table functionality.
changed name to ec2_vpc_net

refactored out IGW functionality
2015-06-23 14:33:06 -04:00
Evan Carter
207abb6f5c Add ClassicLink settings to EC2_launchconfig 2015-06-23 14:11:58 -04:00
Toshio Kuratomi
a1538b490e Fix documentation 2015-06-23 08:57:06 -07:00
Benno Joy
5f6128a300 Merge pull request #205 from amandolo/ec2_module
AWS "EC2 instance" termination_protection and source_dest_check changeability at run-time + block_device_mapping output
2015-06-23 11:56:06 +05:30
Andrea Mandolo
fe4884e8f0 Added some block_device_mapping (disks) informations to EC2 instance module ouput 2015-06-23 07:14:54 +02:00
Andrea Mandolo
2f8300087e Added "EC2 instance" termination_protection and source_dest_check changeability at run-time 2015-06-23 07:14:30 +02:00
Tom Paine
74d9f74536 Parse out space characters in route53 value list
Fixes: https://github.com/ansible/ansible-modules-core/issues/992
2015-06-22 14:52:45 +01:00
Brian Coca
dddb8f9df1 Merge pull request #1548 from freshbooks/ec2_vol_example_fixes
Indentation fix for with and register in the ec2_vol example
2015-06-19 13:08:01 -04:00
Colin Hutchinson
96d2c09457 Indentation fix for with and register in the ec2_vol example 2015-06-18 11:48:27 -04:00
Philip Kirkland
274abb96b1 adding 'encrypted' option into volume dict so ec2 module can easily include encrypted volumes 2015-06-17 14:33:37 +10:00
Benno Joy
351fca028f Merge pull request #1202 from nitzmahone/ec2_state_validation
Added choice validation for EC2 state arg
2015-06-17 07:54:13 +05:30
Brian Coca
898e338318 minor doc fixes 2015-06-16 18:56:24 -04:00
nitzmahone
fd7bbc9eba Added choice validation for state arg
fixes traceback on invalid state arg
2015-06-16 13:42:44 -07:00
Benno Joy
8a998ae76f Merge pull request #1465 from hkariti/ec2_vol_delete_race_condition
ec2_vol: fix race condition when deleting a volume
2015-06-16 10:52:42 +05:30
Greg DeKoenigsberg
28a869a030 Updating cloud modules with proper github author information 2015-06-15 14:41:22 -04:00
Brian Coca
05a2ef106f Merge pull request #326 from preo/ec2-eip-refactor
Refactor and improve the EC2 Elastic IP module.
2015-06-15 10:05:28 -04:00
Brian Coca
1d7e80499b Merge pull request #324 from preo/ec2-vpc-sg-param-check
Validate Security Group rule parameter names for ec2_group module.
2015-06-15 09:45:17 -04:00
Tyler Cross
de617bb3ae Get specific object version with S3 module.
- allow specifying version for mode=get and mode=getstr
- when version specified doesn't exist give an error message that indicates so
2015-06-15 07:43:29 -04:00
Robert Estelle
942f0ce96c Fix missing instance_id param in ec2_eip. 2015-06-14 16:11:33 -04:00
Robert Estelle
063d3d97c6 Remove unnecessary wait_timeout parameter. 2015-06-14 16:11:33 -04:00
Robert Estelle
c36e8947bc Refactoring of ec2_eip module. 2015-06-14 16:11:28 -04:00
Robert Estelle
17c1fa0872 ec2_eip - PEP8 and minor style cleanups. 2015-06-14 16:01:49 -04:00
Robert Estelle
9b7de40922 EC2 Security Group - Validate parameters. 2015-06-14 15:35:41 -04:00
Brian Coca
acfa1b4c39 Merge pull request #1464 from qrtt1/devel
Prevent s3 module getting the memory-error from uploading or downloading a large file
2015-06-12 13:53:50 -04:00
Brian Coca
7f12130d7a fixed version added 2015-06-12 10:39:47 -04:00
Brian Coca
20b1593ae0 Merge pull request #418 from amandolo/ec2_ami_module
Add "block_device_mapping" parameter on EC2_AMI Amazon module
2015-06-12 10:34:06 -04:00
Benno Joy
9fb4a2ee5c Merge pull request #914 from Jimdo/add_sns_notifications_to_cloudformation
Add support for SNS notification ARNs in CloudFormation
2015-06-12 20:01:31 +05:30
Soenke Ruempler
bb8e9563cf Add support for SNS notification ARNs in CloudFormation 2015-06-12 14:34:18 +02:00
Andrea Mandolo
0b0d972998 Add "block_device_mapping" parameter on EC2_AMI Amazon module (DOCUMENTATION) - upgraded 2015-06-12 09:07:27 +02:00
Andrea Mandolo
1e4bd62af5 Add "block_device_mapping" parameter on EC2_AMI Amazon module - ugraded 2015-06-12 09:03:29 +02:00
Bruce Pennypacker
51bc602f42 Added delobj command to delete an object within a bucket 2015-06-11 13:43:15 +00:00
Benno Joy
e7203514ea Merge pull request #870 from tpounds/fix-issue-869
Instance deregistration should try all associated ELBs. Fixes #869
2015-06-10 18:15:55 +05:30
Benno Joy
85e9ccd17b Merge pull request #1030 from jsmartin/asg_rolling_optimizations
ec2_asg: Streamlined rolling udpate algorithm.
2015-06-10 17:44:06 +05:30
Benno Joy
b9d0185cd8 Merge pull request #959 from wimnat/hotfix/issue-958
Fixes rds_subnet_group never reports changed
2015-06-10 08:39:19 +05:30
toninog
fccc925ec5 fixes to code to enable updates of user to groups and delete groups. Fixed example yaml to use groups 2015-06-09 15:27:15 +01:00
Brian Coca
92a4512b0b Merge pull request #887 from defionscode/iam_policy
iam_policy
2015-06-09 09:59:05 -04:00
Benno Joy
2562f72183 Merge pull request #859 from tpounds/fetch-asg-elbs
Use auto scaling group managed ELBs if present.
2015-06-09 10:01:02 +05:30
Trevor Pounds
4b9b047878 Use auto scaling group managed ELBs if present. 2015-06-08 21:24:57 -07:00
Benno Joy
c25fe3438b Merge pull request #737 from raags/devel
Creating ami should be idempotent
2015-06-09 09:07:05 +05:30
Alex Gandy
b91a232fe6 Added volumes dict to ec2_lc example 2015-06-08 12:01:27 -04:00
Benno Joy
f5bafe2463 Merge pull request #355 from h3biomed/route_table_tags
ec2_vpc module: add route table resource tagging
2015-06-08 19:04:54 +05:30
toninog
9f3658d901 Fixed bug in example where updating a user to a group
Fixed bug in create_group and update_group whereby paramaters were not being set correctly.
2015-06-08 13:55:24 +01:00
Hagai Kariti
fb4732fad2 ec2_vol: fix race conditions because we handle errors before actually deleting
Just try to delete the volume and handle the error amazon sends
2015-06-07 10:16:33 +03:00
Brian Coca
32102f7e69 Merge pull request #1472 from bennojoy/fix_11177
fix for 11177 where module readds rule even if the rules exists
2015-06-05 19:09:18 -04:00
Brian Coca
fc255fbd21 minor doc fixes 2015-06-05 14:09:02 -04:00
Brian Coca
cae1f30e95 Merge pull request #756 from defionscode/iam_module
iam_module
2015-06-05 13:58:50 -04:00
Jonathan Davila
801a5e8ed0 iam module with fixes
iam module. fix policy issue.

bugfix

allow for modifying path without declaring new_path
2015-06-05 13:51:27 -04:00
Brian Coca
f5ff5ba348 reverting pep changes that were breaking documentation 2015-06-05 12:01:10 -04:00
Ching Yi, Chan
1517ae8ab2 Refactoring for easier to read 2015-06-05 23:29:11 +08:00
Brian Coca
837bd04f95 minor doc fixes 2015-06-05 10:25:25 -04:00
Brian Coca
182e7c7fc6 made non exec 2015-06-05 10:19:41 -04:00
Brian Coca
37ecabbf6a Merge pull request #1137 from timmahoney/elasticache_subnet_group_management
Elasticache subnet group management
2015-06-05 10:12:24 -04:00
Benno Joy
6b9e9fe05d fix for 11177 where module readds rule even if the rules exists 2015-06-05 12:31:59 +05:30
Tim Mahoney
8c13ac894a Elasticache Subnet Group 2015-06-04 14:40:05 -04:00
Ching Yi, Chan
ed5ea7e921 Prevent memory-error from a large file 2015-06-04 14:28:57 +08:00
Sankalp Khare
f9f17b5e04 Fixed a typo in ec2_vpc module documentation 2015-06-04 03:40:49 +05:30
Brian Coca
273abeb8ee Merge pull request #1435 from civisanalytics/cloudformation_yaml
cloudformation: accept local templates in yaml format
2015-06-03 08:52:10 -04:00
billwanjohi
61741b60c6 cloudformation: accept local templates in yaml format
Since the YAML data format is a subset of JSON, it is trivial to convert
the former to the latter. This means that we can use YAML templates to
build cloudformation stacks, as long as we translate them before passing
them to the AWS API. I figure this could potentially be quite popular in
the Ansible world, since we already use so much YAML for our playbooks.
2015-06-02 21:11:25 +00:00
tedder
b138411671 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
2015-06-01 16:09:20 -07:00
Feanil Patel
fbaeee5dba Output the Internet Gatewoy id directly instead of in a dict. 2015-06-01 15:52:39 -07:00
Benno Joy
4e206e3790 Fixes issue 1197 for s3 module, where the file gets downloaded even if checksums match 2015-06-01 15:52:39 -07:00
Feanil Patel
d796e8f54f Tell me what the igw id is if we created an igw. 2015-06-01 15:47:26 -07:00
xiaclo
1fb035a346 Update route53.py 2015-06-01 14:53:42 -07:00
xiaclo
2aa793ec0e Fix issue #1156
Fix as suggested in the issue.

https://github.com/ansible/ansible-modules-core/issues/1156
2015-06-01 14:53:42 -07:00
Benno Joy
415815ef45 Merge pull request #678 from Jimdo/handle-cfn-rollback-failure
Handle the case where a Cloudformation stack rollback fails.
2015-05-27 22:45:33 +05:30
billwanjohi
40eef6c3ec s3 put: add support for server-side encryption
- added 'encrypt' boolean option
- reordered module options alphanumerically
2015-05-27 16:00:01 +00:00
Benno Joy
57c8547a3b Merge pull request #1333 from wimnat/feature/issue-1332
rds module now will exit gracefully when resource=none
2015-05-27 19:59:33 +05:30
Toshio Kuratomi
5f9592248a Minor fixups found during review of #582 2015-05-27 07:03:29 -07:00
Toshio Kuratomi
dcc04f9505 Merge branch 's3_retry' of https://github.com/stansonhealth/ansible-modules-core into stansonhealth-s3_retry
Conflicts:
	cloud/amazon/s3.py
2015-05-27 06:55:33 -07:00
Jonathan Davila
e2773f7554 author fix 2015-05-27 08:37:39 -04:00
whiter
71ad56b151 Fix for issue #1332 - when instance is has finished deleting and get_db_instance returns None, exit gracefully 2015-05-26 15:12:00 +10:00
Benno Joy
784589eede Merge pull request #1414 from wangqiang8511/issu_fix_1302
Do instance update after add tags to instance.
2015-05-25 07:56:55 +05:30
Wang Qiang
31f3319b56 Do instance update after add tags to instance. 2015-05-25 09:25:11 +08:00
marko
5f5be7bc2a Added support for foreign security groups (Fixes: #373) 2015-05-22 12:34:41 +02:00
Brian Coca
150b71f11a removed executable bit 2015-05-21 07:01:08 -04:00
Jonathan Mainguy
3a294c3379 fixes example documenation 2015-05-21 09:07:23 -04:00
Tom Paine
c97af02e40 Update ec2.py
updated default and choices to match standard
2015-05-18 21:34:57 +01:00
Tom Paine
1f7f7c7dbc Update ec2.py
Update instance_type description to feature up-to-date list of instance types. Matches format of 'ebs_optimized' param which also includes a link.

Update region description to feature up-to-date list of ec2 regions. Matches format of 'ebs_optimized' param which also includes a link.

Updated choices for monitoring param to be explicit bool matching default 'yes'.

Updated choices for source_dest_check to be explicit bool matching default 'true'.

Updated tenancy choices to remove redundant phrasing in comments.
2015-05-18 21:30:18 +01:00
Toshio Kuratomi
81b476cd02 Update module "imports" to new style
Fixes #1351
2015-05-18 11:59:20 -07:00
Scot Spinner
720aeffca2 adding parameter group option 2015-05-18 10:34:21 -07:00
Tom Paine
764c3ae5a4 Update ec2.py
Make assign_public_ip choices explicit. People incorrectly try and assign a specific IP thinking it accepts an IP address as a value.
2015-05-18 14:21:49 +01:00
Benno Joy
601fa16ada Merge pull request #1327 from bennojoy/issue_600
fixes issue #600, where ec2 module returns instance state as running ev…
2015-05-18 11:40:02 +05:30
Brian Coca
e1f68b7f33 Merge pull request #1323 from feanil/feanil/vpc_igw
Tell me what the igw id is if we created an igw.
2015-05-15 10:12:56 -04:00
Feanil Patel
77ca3c1148 Output the Internet Gatewoy id directly instead of in a dict. 2015-05-15 09:40:30 -04:00
Benno Joy
1c418805d9 Merge pull request #673 from mschurenko/ec2_elb_lb_add_stickiness
adding stickiness support to ec2_elb_lb.py
2015-05-15 15:01:11 +05:30
Benno Joy
dee65f83af Merge pull request #1212 from zimbatm/ec2_group-name_priority
ec2_group: select own group if the name matches
2015-05-15 14:47:10 +05:30
Matt Schurenko
08155f145e adding stickiness support to ec2_elb_lb.py
removing policy if enabled is no

adding sanity checks

removing debuging

check if policy exists before deleting

updating version_added to 2.0

adding stickiness support to ec2_elb_lb.py (squashed commit)
2015-05-14 22:30:45 -07:00
Benno Joy
d8b9c1f440 Merge pull request #1206 from mjfroehlich/ec2-support-mfa-auth
ec2: Use get_aws_connection_info to get AWS creds.
2015-05-14 17:46:29 +05:30
Benno Joy
ed62de6d3c Fixes issue 1197 for s3 module, where the file gets downloaded even if checksums match 2015-05-14 09:03:50 +05:30
Benno Joy
9d9d8def6f fixe issue #600, where ec2 module returns instance state as runing even after instance is terminated 2015-05-14 08:29:11 +05:30
Feanil Patel
0e213e985b Tell me what the igw id is if we created an igw. 2015-05-13 17:12:41 -04:00
Brian Coca
74351490f7 doc fix 2015-05-13 15:58:07 -04:00
whiter
da93950fe5 Added postgresql-license type 2015-05-13 16:16:41 +10:00
Jell
6b27cdc08e [ec2_vol] Find or Create volume by name 2015-05-12 07:06:37 +02:00
Toshio Kuratomi
60a66a544d Several cleanups to many modules:
* Fix docs to specify when python2.6+ is required (due to a library
  dep).  This helps us know when it is okay to use python2.6+ syntax in
  the file.
* remove BabyJson returns.  See #1211  This commit fixes all but the
  openstack modules.
* Use if __name__ == '__main__' to only run the main part of the module
  if the module is run as a program.  This allows for the potential to
  unittest the code later.
2015-05-11 12:15:53 -07:00
Brian Coca
18ccced5fe Merge pull request #1274 from bennojoy/issue-122
fixes issue 122, where the module recreates the route table in each run
2015-05-08 15:50:37 -04:00
Brian Coca
bc22ee9069 Merge pull request #1015 from jml/ec2-eip
Make ec2_eip idempotent
2015-05-08 15:24:20 -04:00
Chris Lundquist
4670e1285b [ec2_ami_find] fix ami_search doc copy pasta 2015-05-07 11:51:11 -07:00
Benno Joy
e2deee66d3 fixes issue 122, where the module recreates the route table in each run 2015-05-07 16:04:01 +05:30
Brian Coca
a9781b3712 Merge pull request #1250 from afeinberg/patch-1
Fix a typo in create_instances
2015-05-05 10:40:07 -04:00
Sam Doiron
de76c797ab Fix Issue #1216 (ValueError with Amazon RDS)
Fix typo where wrong variable was used, causing ValueError.
2015-05-05 10:53:17 -03:00
Herby Gillot
6ce3ef36e3 Use existing ec2_eip address if already associated
If an EC2 instance is already associated with an EIP address, we use
that, rather than allocating a new EIP address and associating it with
that.

Fixes #35.
2015-05-05 11:37:47 +01:00
Alex Feinberg
e749184bc7 Fix a typo in create_instances
Fix a typo in create_instances: use 'placement_group' instead of placement_group
when calling boto_siupports_param_in_spot_request().
2015-05-04 17:14:42 -07:00
Pascal Borreli
f29a6ec54d Fixed typos 2015-05-04 12:54:03 +01:00
Brian Coca
9028e9d4be minor doc fixes, set version added for new tags: parameter
should Fix #10894
2015-05-01 09:58:27 -04:00
xiaclo
946af50b22 Update route53.py 2015-05-01 12:28:47 +10:00
xiaclo
5d1a3ee0ac Fix issue #1156
Fix as suggested in the issue.

https://github.com/ansible/ansible-modules-core/issues/1156
2015-04-30 13:01:00 +10:00
zimbatm
34378b6c6a ec2_group: prioritise current VPC group names over others 2015-04-28 10:19:20 +01:00
zimbatm
8a4d5856ce ec2_group: select own group if the name matches
This fixes an issue where multiple VPC have the same group name and
the one from the other VPC is selected.
2015-04-27 19:26:13 +01:00
Brian Coca
78de8bbd99 removed unused and undefined aws_regions 2015-04-27 12:38:57 -04:00
Brian Coca
e137aea5d3 Merge pull request #1195 from bcoca/ec2_scaling_policy_fix
removed redundant region def
2015-04-27 12:34:59 -04:00
Martin Froehlich
4bcbcc8869 Use get_aws_connection_info to get AWS creds.
Previously used get_ec2_creds did not consider security_token,
making MFA requests fail.
2015-04-26 14:50:07 +01:00
Brian Coca
0e23dd6c55 avoid exception when boto is not available 2015-04-24 11:03:36 -04:00
Brian Coca
a905edd536 removed redundant region def 2015-04-24 08:54:56 -04:00
Brian Coca
8ce2a18921 Merge pull request #1184 from bobby/ec2_vpc-without-subnets
Fixes regression introduced by edf1ac1ea6
2015-04-21 15:17:44 -04:00
Bobby Calderwood
98a9f2d5b8 Fixes regression introduced by edf1ac1ea6 2015-04-21 14:56:46 -04:00
bw-will-usher
0846de2cd5 Fixed MS SQL port number in documentation (1443->1433) per: https://support.microsoft.com/en-us/kb/287932 2015-04-21 07:59:05 -04:00
Brian Coca
be89a2f5fc added new ec2_ami_find as per #905 2015-04-16 15:39:26 -04:00
Brian Coca
5e1224c4a8 deprecated ec2_ami_search 2015-04-16 15:39:26 -04:00
sisso
34d6d6f777 fixed bug where scaling policy return a random policy if many autoscale group have policies with same name. 2015-04-16 14:36:26 -03:00
Brian Coca
89bd6af0ed Merge pull request #966 from jnsaff/devel
Added support for tagging images in ec2_ami.py
2015-04-16 11:35:37 -04:00
Jan Brauer
fcea4e1884 Add missing comma 2015-04-10 19:05:57 -04:00
Daekwon Kim
7684059044 Fix indent of "register" key 2015-04-09 19:10:49 +09:00
Daekwon Kim
88639ae8be Fix typo (volue -> volume) 2015-04-09 19:09:42 +09:00
James Martin
b67e1a1ce9 Streamlined rolling udpate algorithm. Still need to account for partials, and not waiting for instances if we're mass terminating them. 2015-04-07 22:16:28 -04:00
Kyle Johnson
86ed1cd0a9 Fix typo in rds_subnet_group.py
aws_connection_kwargs should be aws_connect_kwargs
2015-04-06 10:00:17 -04:00
Jesse Rusak
030703f4ca Update rds module for RDS2 parameter name change.
boto's rds2 renamed `vpc_security_groups` to `vpc_security_group_ids`
and changed from a list of `VPCSecurityGroupMembership` to just a
list of ids. This accommodates that change when rds2 is being used.
2015-04-02 15:32:12 -04:00
Dan Abel
c5f5dfd8a0 use aws connect calls that allow boto profile use 2015-04-02 10:51:18 +01:00
steenzout
d960dc1584 issue #994: use HAS_BOTO to determine if import was successful:
- removed import of sys module.
- HAS_BOTO constant to check if import was successful.
- trigger a failure when import fails.
- removed unnecessary imports.
2015-04-01 17:31:10 -06:00
Brian Coca
e6e3ade6fa added support for postgres9.4 which is now available from amazon 2015-03-31 11:46:54 -04:00
Brian Coca
613961c592 really fixed docs this time 2015-03-31 09:15:20 -04:00
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