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

630 commits

Author SHA1 Message Date
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
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
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