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

722 commits

Author SHA1 Message Date
Jonathan Davila
51d2f49ae0 Updated ec2_lc docs 2016-02-26 16:21:33 -06:00
Nate Brown
72da61ba83 ELB Proxy Protocol support for backends 2016-02-25 11:12:58 -08:00
Neil Saunders
6aa0cd4457 Fix for issue #3109: Executing ec2_group with rules fails with "Invalid rule parameter '['" 2016-02-25 14:18:02 +00:00
Constantin07
bc94e691e8 Added explicit type for 'tags' option 2016-02-24 23:33:42 +00:00
Toshio Kuratomi
e9454fa44f Merge pull request #2352 from bermudezjd/feature/iam_policy_present_state_includes_policy_changes 
Feature/iam policy present state includes policy changes
 2016-02-24 08:50:50 -08:00
James Cammarata
4bc2a189ba Merge pull request #3058 from Constantin07/update_ec2_tag1 
ec2_tag.py - Fixing issue #3057 - AttributeError: 'str' object has no attribute 'i…
 2016-02-24 11:16:55 -05:00
Joel
147b724f5d Allow us to sort by all available datatypes 2016-02-22 10:48:14 -06:00
Daniel Petty
e256ae0683 replaced sudo with become 2016-02-18 16:18:59 -07:00
Constantin07
9e42b2a684 Fixing issue #3057 - AttributeError: 'str' object has no attribute 'items' 2016-02-17 22:09:02 +00:00
Tom Bamford
5749454723 Bugfix: Permit SOA record type 2016-02-17 06:29:53 +02:00
Matt Martz
c7845456a6 Various simple linting type cleanups on modules 2016-02-16 15:58:44 -06:00
jjshoe
b0cbae51b5 Less engrish 2016-02-08 19:03:35 -06:00
Michael Baydoun
98c16a4f1f Update ec2.py 
Documentation is not clear that tag used in count_tags must be an existing instance_tag
 2016-02-08 19:14:19 -05:00
James Cammarata
e2f8ed1609 Merge pull request #2735 from noqcks/no-default-sec-groups 
Elasticache Module: changing default cache_security_group to none
 2016-02-07 21:43:35 -05:00
Scott Brown
2f329f832e Fixing missing interpolation variable 2016-02-05 14:35:50 -08:00
Ashwanth Kumar
3150c094b5 Doing exponential backoff on route53 upon AWS throttling 2016-02-05 13:27:55 +05:30
Toshio Kuratomi
29b81a4153 Merge pull request #2826 from shawnsilva/cloudformation-req-params 
The parameters 'template' and 'template_url' are incorrectly required in all cases in the cloudformation module
 2016-02-02 13:27:30 -08:00
Ryan-Neal Mes
c30bca6808 Indented code so it only executes tag comparison for matching cird values 2016-02-01 13:58:12 +02:00
Toshio Kuratomi
93d02189f6 Remove duplicate documentation fields 2016-01-28 09:24:20 -08:00
Brian Coca
cdfb578b60 Merge pull request #2646 from h1ppo/patch-2 
updating choices for rds parameter engines
 2016-01-25 23:46:12 -05:00
Brian Coca
382ae8f15f Merge pull request #2800 from noqcks/iam-grammar-issue 
IAM Module: fixed grammatical issue in iam.py. exit -> exist.
 2016-01-25 23:39:57 -05:00
techraf
2016d3d822 Fixed typo in example playbook 2016-01-19 20:45:50 +09:00
Brian Coca
08135a9cf8 Merge pull request #2778 from sunnyone/fix-iam-policy-pdoc-treatment 
Fix iam_policy pdoc variable assignment
 2016-01-18 21:21:19 -05:00
Brian Coca
ffea58ee86 Merge pull request #2817 from atplanet/ec2-ami-find-fix-region 
Remove explicit region parameter from ec2_ami_find
 2016-01-18 20:48:29 -05:00
Brian Coca
18bad1f691 tabs are bad 2016-01-18 17:10:29 -05:00
Henrique Rodrigues
b8d2a3d3b4 Fix misspelling of the word 'certificate' 2016-01-18 16:41:44 +00:00
Brian Coca
fbaf4fb628 Merge pull request #2746 from ferrants/patch-2 
updated s3 module documentation
 2016-01-18 11:17:09 -05:00
Brian Coca
618f74f35f added version_added 2016-01-18 08:25:32 -05:00
Brian Coca
ce8da38364 Merge pull request #2324 from Constantin07/update_ec2_vol 
ec2_vol.py - Added 'delete_on_termination" option for volume attachment action
 2016-01-18 08:20:26 -05:00
Shawn Silva
f410f44c28 The parameters 'template' and 'template_url' are incorrectly required in all cases. 
If the state is 'absent' they should not be required. A few lines below the correct check is already in place.
 2016-01-16 13:09:58 -05:00
Ben Visser
18fdea8aba changing default of cache_security_groups to none, removing the ['default'] 
OCD is making me fix the inconsistency with how None is typed. First Letter Capitalized All Over Now.

cleaning up the default object that was created for the cache_security_groups and removing checks dealing with it.

clean up space

Changing default cache_security_groups from [default] to None.
 2016-01-15 13:56:07 -05:00
Brian Coca
1a298f7948 updated s3 docs to reflect mode choices 
fixes #2318
 2016-01-15 00:44:29 -05:00
autotune
f769305bd4 1113 fix ec2 subnet tags 2016-01-14 16:17:36 -08:00
Tom Bamford
14377c9857 Remove explicit region parameter from ec2_ami_find 2016-01-14 23:30:27 +00:00
Brian Coca
34aa679f41 Merge pull request #2734 from noqcks/elasticache-engine-choices 
Elasticache Module: cache engine choices
 2016-01-14 09:21:25 -05:00
Ben Visser
04d1c63358 two choices for cache engine. adding them. 
revert spacing

undoing quotes around default. will do another pull requests

Making documentation more explicit for elasticache engine choices.
 2016-01-12 23:07:55 -08:00
Ben Visser
593e74cfc5 fixed grammatical issue in iam.py. exit -> exist. 2016-01-12 15:18:30 -08:00
Brian Coca
4d60f963be Merge pull request #2543 from krdlab/fix-ec2_elb_lb-status 
Fix `self.changed` value in `ElbManager` (ec2_elb_lb)
 2016-01-12 10:48:15 -05:00
Brian Coca
e277a9b1b9 Merge pull request #2375 from bcoca/rds_port_defaults 
made port default depending on db engine
 2016-01-12 10:46:55 -05:00
Brian Coca
afdd4c3a20 updated version_added 2016-01-12 09:33:58 -05:00
Joost Cassee
4a6d323b9e Add wait_timeout option to route53 module 
This option is used to make sure the module does not block forever.
 2016-01-12 13:49:20 +01:00
Joost Cassee
1bcb90e785 Add wait option to route53 module 
This option makes the module wait for the changes to replicate to all
Amazon DNS servers.
 2016-01-12 13:47:05 +01:00
Brian Coca
1b8487ffce Merge pull request #2753 from jonhadfield/return_allocation_id 
return allocation id for address created in vpc
 2016-01-11 18:49:31 -05:00
Brian Coca
4d19ee903c crrected version added 2016-01-11 18:27:37 -05:00
Brian Coca
316749c653 Merge pull request #2548 from Etherdaemon/propose_wait_for_removed_ec2_elb_lb 
wait_for to ensure ELB has been removed from AWS
 2016-01-11 18:22:16 -05:00
Brian Coca
b2c94d0eab corrected version added 2016-01-11 18:16:07 -05:00
Brian Coca
18284d18a3 Merge pull request #2489 from jimbydamonk/evaluate_targe_health 
Add evaluate taget health for alias based records
 2016-01-11 18:11:27 -05:00
Bermudez, Jaime
2ad0be9425 Merge branch 'devel' into feature/iam_policy_present_state_includes_policy_changes 
Conflicts:
	cloud/amazon/iam_policy.py
 2016-01-11 13:13:33 -05:00
Yoichi Imai
00376af7d6 Fix iam_policy pdoc variable 2016-01-08 13:05:31 +09:00
Constantin07
56fa475dcb Added delete_on_termination option for volume attachment 2016-01-07 12:14:10 +00:00
Brian Coca
b08cf6b94f Merge pull request #2730 from bcoca/iam_policy_json 
be smarter when dealing with policy_json input
 2016-01-04 10:19:38 -05:00
Jon Hadfield
0320411d03 return allocation id for vpc address. 2016-01-02 11:16:46 +00:00
Matt Ferrante
2c75e72e83 updated s3 module documentation 2015-12-30 20:04:41 -05:00
Ben Visser
410ee32770 staging that num_nodes is required when state=present 2015-12-25 23:14:04 -07:00
Brian Coca
1fe6479617 be smarter when dealing with policy_json input 
Now module will assume that if the argument is a string it is already formated as json
and will only try to convert non strings into json string.
Also removed unused 'msg' var declarations and the ifs that set them
fixes #2009
 2015-12-24 00:18:21 -05:00
Toshio Kuratomi
d6d3a8b21c Merge pull request #1903 from andynelson/extra-route-targets 
ec2_vpc module update (eni and vpc peering connections & return state on termination)
 2015-12-18 17:36:13 -08:00
Toshio Kuratomi
5fe0fbbf20 Merge pull request #1883 from haad/ec2_elb_fixes 
Two fixes for ec2_elb_lb module to make stickiness work with undefined expiration period
 2015-12-18 17:33:05 -08:00
Brian Coca
6b13da738b updated module docs, added choices to state 2015-12-15 08:43:49 -05:00
Michel Alexandre Salim
18f4f5dcc6 Set the argument type for ec2_vol's encrypted parameter 
If this is not set, Ansible parses the parameter as a string.
This is fine if the parameter is not provided by the caller, but
if it is set to False or True explicitly, ec2_vol receives this as
the string 'False' or the string 'True', both of which are truthy.

Thus, without this fix, setting the parameter results in encryption
always enabled.
 2015-12-09 10:14:06 +07:00
Jason Paige
cc0ee4ad40 updating choices for rds parameter engines 2015-12-08 10:31:53 +00:00
Etherdaemon
a56ffff51b Update to wait and wait_timeout with a maximum of 10 minutes timeout 2015-12-07 20:27:31 +10:00
Brian Coca
15dcabe012 Merge pull request #2541 from joshuaeke/patch-1 
Update ec2.py remove state tag
 2015-12-05 10:12:55 -05:00
Arthur Clement
bfcdb05597 Example of single instance with ssd gp2 root volume creation 2015-12-03 22:48:13 +01:00
Brian Coca
43d2ecda06 Merge pull request #2546 from traveloka/fix-ec2-snapshot-info 
Fix ec2_snapshot documentation
 2015-12-01 09:46:48 -08:00
Toshio Kuratomi
cd9a7667aa Don't raise or catch StandardError in amazon modules 2015-11-30 19:02:28 -08:00
Mike Buzzetti
b00e1b556c Add evaluate taget health for alias based records 2015-11-30 17:50:40 -05:00
Brian Coca
aad7497f18 Merge pull request #2542 from maxrothman/patch-1 
Fix rds "promote" command never promoting
 2015-11-27 13:28:23 -08:00
Etherdaemon
185a371efb Proposing a wait_for function to ensure elb has been successfully removed 2015-11-26 16:58:51 +10:00
Jay Rogers
cab97cd2d9 Update in Amazon IAM Policy Documentation 
There were typos in the documentation that made the examples seem misleading of what was being demonstrated. This update fixes that.
 2015-11-25 18:46:17 -06:00
Michel Alexandre Salim
b07ff99cac Fix ec2_snapshot documentation 
last_snapshot_min_age is added in 2.0, not 1.9
 2015-11-25 15:08:48 +07:00
Max Rothman
f1f201c234 Fix rds "promote" command never promoting 
Previously, the `promote` command in the `rds` module would always return OK and never actually promote an instance. This was because `promote_db_instance()` had its conditions backwards: if the instance had the `replication_source` attribute indicating that it **was** a replica, it would set `changed = False` and do nothing. If the instance **wasn't** a replica, it would attempt to run `boto.rds.promote_read_replica()`, which would always fail.
 2015-11-24 16:10:28 -05:00
krdlab
dd76b51990 Fix self.changed value in ElbManager (ec2_elb_lb) 2015-11-25 04:42:51 +09:00
joshuaeke
ab420300ef Update ec2.py remove state tag 
'exact_count' and 'state' are mutually exclusive options they should not be in the following examples:
- # Enforce that 5 running instances named "database" with a "dbtype" of "postgres" example and 
- # Enforce that 5 instances with a tag "foo" are running
 2015-11-24 18:48:59 +00:00
Toshio Kuratomi
8ae30f1822 Minor simplification of code 2015-11-23 16:23:41 -08:00
Toshio Kuratomi
5617cd57cf Merge pull request #2512 from erewh0n/ec2-require-all-groups 
Fail ec2 module when group names cannot resolve to IDs
 2015-11-23 16:20:31 -08:00
Toshio Kuratomi
1270bacee7 Merge pull request #2425 from aioue/patch-5 
Update ec2_elb_lb.py
 2015-11-23 15:55:51 -08:00
Brian Coca
6bd8020f65 corrected version_added, removed empty alias 2015-11-24 09:32:46 -08:00
Brian Coca
b789db7b9d Merge pull request #2211 from kai11/feature/spot_launch_group 
Added launch group support for ec2 module
 2015-11-23 09:31:33 -08:00
Keith Hassen
39ef6a1a80 Fail if any group name is not resolved to an ID. 2015-11-22 22:07:47 -05:00
Brian Coca
0e043f8c58 Merge pull request #2505 from donckers/devel 
Fix #822 - Correct failure to overwrite existing records
 2015-11-20 17:22:22 -08:00
Brian Coca
6d722608d6 Merge pull request #2413 from raben2/devel 
Absent Function was not working on user with login profile
 2015-11-20 17:00:20 -08:00
Daniel Donckers
3b8147af30 Fixes #822 2015-11-20 14:55:39 -06:00
Mike Riddle
062c7764e6 Fixed error message: TypeError: fail_json() takes exactly 1 argument (2 given) 2015-11-18 15:10:15 -05:00
Brian Coca
1d6b31a90f fixed break order 2015-11-19 09:28:40 -08:00
Tom Paine
4bc834485a Update ec2_elb_lb.py 2015-11-18 19:45:32 +00:00
Brian Coca
2c92fc4d3c Merge pull request #2484 from bcoca/ec2_elb_get_really_all 
Ec2 elb get really all items
 2015-11-17 12:20:51 -08:00
Brian Coca
1258f82648 Merge pull request #2467 from cinek810/fix_ident 
It may be string with int comparison, if ansible user specifies ident…
 2015-11-13 14:57:21 -08:00
Marcin Stolarek
b6223ca729 Save changes of special characters to rset, without that comparison rset.to_xml() == wanted_rset.to_xml() will fail if record contains * or @ characters. 2015-11-13 11:32:10 +01:00
Marcin Stolarek
3193961cf5 It may be string with int comparison, if ansible user specifies identifier as int 2015-11-13 10:45:27 +01:00
J Levitt
889274a525 Add rds restore example to list of examples 
There was no db restore example. I've provided one that shows how to do the restore, then add a security group (you cannot add the security group during the restore step -- it has to be done in a modify step afterward). Also, I show how to get the endpoint.
 2015-11-11 15:15:30 -06:00
Rabenstein
7d665db5e5 Squash of 3 commits for bugfix. 
Absent unction was not working on user with login profile
also fixed the exception handling

fixed the delete user function
now works with or without loginprofile (password)

typo
 2015-11-11 09:54:55 +01:00
Andy Nelson
9618986804 Update to ec2_vpc.py to: 
1 allow interface ids and vpc peering connections as route targets
2 set state to "terminated" when VPC is removed
3 fix some comment typos

updates per PR comments
 2015-11-08 18:35:27 +00:00
Tom Paine
dd26c37f6b Update ec2_elb_lb.py 
add connection draining default
 2015-11-06 17:43:24 +00:00
Will Thames
0dd58e9326 Use connect_to_aws where possible 
`connect_to_aws` fixes a bug with security tokens in AWS.
Modules should use that rather than calling
`boto.x.connect_to_region`
 2015-11-06 19:05:01 +10:00
Toshio Kuratomi
62672b8b85 Merge pull request #2228 from abridgett/feature/add_ec2_elb_lb_idle_timeout 
add idle_timeout support
 2015-11-03 10:24:58 -08:00
Brian Coca
cac69f3135 added missing version_added 2015-11-03 13:25:46 -05:00
Brian Coca
aa6f80669a Merge pull request #534 from ferrants/ami-launch-permissions 
ec2_ami can update an ami's launch_permissions
 2015-11-03 13:21:44 -05:00
Brian Coca
c91da5714e Merge pull request #2279 from wimnat/feature/iam_policy_idempotentcy 
Allow iam_policy to maintain idempotence if the role referenced has …
 2015-11-03 13:10:42 -05:00
Brian Coca
3aee4b9469 Merge pull request #2326 from jibsheet/devel 
Mark this as a string so it is rendered in the docs
 2015-11-03 13:10:15 -05:00
Toshio Kuratomi
0de2627efc Make cache_parameter_group the name of this new param to match with similar params (leave old name as an alias) 2015-11-02 17:33:04 -08:00
Toshio Kuratomi
e16c5c54fd Revert "Expose cache_parameter_group_name in elasticache module" 
This PR #1950 implements duplicate functionality to #1353
This reverts commit b04efa22c4.

Conflicts:
	cloud/amazon/elasticache.py
 2015-11-02 17:27:54 -08:00
Brian Coca
59b87836d1 Merge pull request #2222 from pgilad/patch-1 
Add state=running on some ec2 examples
 2015-11-02 19:12:25 -05:00
Brian Coca
d6c97bc880 Merge pull request #2381 from gregdek/devel 
Module ownership changes
 2015-11-02 19:00:21 -05:00
Brian Coca
a38e0095f9 added missing version added 2015-11-02 18:54:30 -05:00
Brian Coca
6e905f0586 Merge pull request #1950 from frenchfrywpepper/cache_parameter_group_name 
Expose cache_parameter_group_name in elasticache module
 2015-11-02 18:49:55 -05:00
Brian Coca
794cbeea23 use marker instead of is_truncated which does not seem to work 2015-11-02 13:10:20 -05:00
Brian Coca
b90318ae6c loop to get all load balancers, boto limited to 400 at a time 
fixes #2115
 2015-11-02 13:05:22 -05:00
Brian Coca
77ded03510 Merge pull request #953 from rwky/asg_542 
Fixes #542 error when ec2_asg arguments aren't specified
 2015-11-02 09:04:42 -05:00
Adrian Bridgett
d4319555a0 Merge branch 'devel' into feature/add_ec2_elb_lb_idle_timeout 
* devel: (84 commits)
  Document and return an error if httplib2 >= 0.7 is not present.  We
  since find doesn't make changes, support check mode and gather data for other tasks in check mode
  Correct typo in yum module docs
  Update doc to reflect password is required if adding a new user
  Update error message to be more explicit
  Simplify logic to handle options set to empty string
  Fix to issue 12912. Supply 'force' to install of python-apt.
  Note the difference between yum package groups and environment groups.
  rearranged systemd check, removed redundant systemctl check fixed unused cmd and state var assignements
  added earlier paths to systemd
  make os_router return a top level 'id' key
  Version bump for new beta 2.0.0-0.4.beta2
  allow os_port to accept a list of security groups
  allow os_server to accept a list of security groups
  Add capability for stat module to use more hash algorithms
  allow empty description attribute for os_security_group
  Update hostname.py
  simpler way to check if systemd is the init system
  make os_keypair return a top level 'id' key
  make os_flavor return a top-level 'id' key
  ...
 2015-10-29 14:18:34 +00:00
Greg DeKoenigsberg
344cf5fc0e Remove @ralph-tice from maintainership per his request 2015-10-28 14:47:03 -04:00
Greg DeKoenigsberg
7cb9289197 Clarity of owner, even though module is deprecated 2015-10-28 14:40:54 -04:00
Greg DeKoenigsberg
57dcf2c9dd @lorin stepping down as maintainer 2015-10-28 14:38:11 -04:00
Brian Coca
3b5afc2393 made port default depending on db engine 2015-10-27 21:49:54 -04:00
Bermudez, Jaime
6992d0d465 Merge remote-tracking branch 'upstream/devel' into feature/iam_policy_present_state_includes_policy_changes 2015-10-25 08:37:40 -04:00
Bermudez, Jaime
d5f48d29e1 Simplify logic around "present" state and skip dupes. If the policy doesn't exist or the policy document doesn't match or if we're not skipping dupes, then we go ahead and update the respective user/group/role policy. 2015-10-22 14:54:28 -04:00
Etherdaemon
08559670e5 Update try statement as pointed out by defionscode 2015-10-22 09:12:58 +10:00
Etherdaemon
d6da9c1516 Merge branch 'devel' into fix_aws_iam_connection_12831 2015-10-22 09:09:30 +10:00
Kevin Falcone
735eefb2ca Mark this as a string so it is rendered in the docs 
When this was treated as a boolean, sphinx was leaving the Default
column on http://docs.ansible.com/ansible/ec2_module.html blank,
implying it would use AWS's default.  In reality, it passes False, which
overrides the defaults at AWS (it's possible to boot an instance which
AWS claims will always have EBS optimization without it because of this
silently passed False).
 2015-10-21 16:43:50 -04:00
Toshio Kuratomi
bc3b1abd68 Another fix for docs 2015-10-21 08:40:10 -07:00
Toshio Kuratomi
e41cde3116 Correct docs build 2015-10-21 08:36:08 -07:00
Brian Coca
377aaf526c Merge pull request #2292 from Constantin07/update_ec2_ami_find 
Included 'block_device_mapping' in the output of module and other mis…
 2015-10-20 13:07:00 -04:00
Constantin Bugneac
01b8432496 Added documentation for returned structure 2015-10-20 09:30:57 +01:00
Etherdaemon
2b2285eb67 fixes #12831 by updating the boto iam connection method to connect_to_region 2015-10-20 16:38:27 +10:00
Brian Coca
14f32de7a6 added missing version_added to new accesslogs feature 2015-10-19 20:11:54 -04:00
Brian Coca
f4ed4b37a9 Merge pull request #2126 from nfelsen/access_logs 
Adding support for access logs in ELB
 2015-10-19 20:06:31 -04:00
Brian Coca
250b1f48fc Merge pull request #2274 from niothiel/devel 
Remove duplicate logic
 2015-10-19 17:53:53 -04:00
Brian Coca
300c816503 Merge pull request #2180 from wimnat/feature/issue-695 
Resolve issue 695 (no change reported) and other misc fixes
 2015-10-19 10:47:02 -04:00
Brian Coca
1ec0c1893a added note on when reboot command became available 
fixes #2050
 2015-10-17 00:49:01 -04:00
Constantin Bugneac
e715f7f968 Included 'block_device_mapping' in the output of module and other missing attributes 2015-10-16 16:08:10 +01:00
Nathaniel Felsen
2e74b17fad fixing merge conflict 2015-10-16 00:25:15 -07:00
Brian Coca
f2cd132cd0 Merge pull request #2287 from pgilad/patch-1 
Docs: add state choices to ec2_elb_lb
 2015-10-15 18:19:56 -04:00
Gilad Peleg
68e1ff2f81 Docs: remove redundant quotes in ec2_elb docs 2015-10-16 00:57:04 +03:00
Gilad Peleg
970185f2d2 Docs: add state choices to ec2_elb_lb 
add state options (`present` and `absent`) to `ec2_elb-lb` doc
 2015-10-16 00:37:21 +03:00
whiter
6fc58855b9 Allow iam_policy to maintain idempotentce if the role referenced has been removed 2015-10-15 13:21:05 +11:00
whiter
cccef7b135 Remove access_key and secret_key as these are provided by aws doc fragment 
Remove ec2 doc fragment as region is not required for IAM
 2015-10-15 12:58:03 +11:00
whiter
5e61f0882b Add region to doc and handle missing region parameter 2015-10-15 01:31:42 +00:00
Rob
3360cef024 Update ec2_vol.py 
Changed=true now reported on new volume.
Only detach volume when instance is specified as 'None' or '' rather than whenever instance is not specified at all
Fix regression caused by 6b27cdc where by no volume is created if id or Name is not supplied
Remove unnecessary empty aliases
Corrected example to use acceptable parameter for ions
Added exception handling to get_all_instances call
Moved the attachment state validation code to attach_volume function rather than create_volume function
Refactored attach_volume and detach_volume so that changed state can be passed back to call
Created get_volume_info function so that state=present and state=list can return the same data.  Also added instance_id as a returned value in attachment_set dict
Updated aws connection method so that boto profile can be used
 2015-10-15 01:20:23 +00:00
Val Komarov
986d4064e9 Remove duplicate logic 2015-10-14 15:54:04 -04:00
Brian Coca
6f9ff0b914 Merge pull request #2248 from Constantin07/devel 
ec2_vol: added deleteOnTermination in the output of list option
 2015-10-12 18:47:31 -04:00
Brian Coca
f1fc76d732 Merge pull request #2214 from fperks/fix-ec2-error-on-instance-status-change 
Fix error on ec2 status change
 2015-10-12 18:38:10 -04:00
Adrian Bridgett
cc821492d3 remove unneeded aliases 2015-10-12 17:45:37 +01:00
Constantin Bugneac
83291dbefc Added deleteOnTermination in the output of list option 2015-10-12 10:49:16 +01:00
Abhijit Menon-Sen
ebd8b12e15 Add missing variable initializations 
Without this, «ec2: state=stopped instance_ids=…» would fail with a
traceback like this:

    if inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check:
NameError: global name 'source_dest_check' is not defined
 2015-10-11 07:25:56 +05:30
Frank van Tol
2c24d0482b Update ec2_asg.py 2015-10-09 14:35:26 +02:00
Adrian Bridgett
686ceb81d7 add idle_timeout support 2015-10-08 16:28:01 +01:00
Brian Coca
5f1f1b2904 Merge pull request #2216 from wimnat/feature/revert-1906 
Set default of dimensions parameter to be empty dict
 2015-10-08 11:03:21 -04:00
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