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

2419 commits

Author SHA1 Message Date
daniel-sc
44af735ac4 Allowing specifying ip by address 2016-01-12 22:57:31 +01:00
daniel-sc
a757af0264 Allowing to specify specific external ip for gce instances 2016-01-12 22:57:31 +01:00
Brian Coca
59f3b82898 Merge pull request #2633 from andmarios/devel 
fix: don't set scopes' account to service account used for gce instance creation
 2016-01-12 10:50:09 -05: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
9d4403f2b3 Merge pull request #2521 from wrouesnel/docker_reloaded_fixes 
docker: Fix state=reloaded to detect default LoggingDriver for docker
 2016-01-12 10:47:30 -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
Brian Coca
b0542e6959 Merge pull request #2790 from jcassee/feature/route53-wait 
Add wait option to route53 module
 2016-01-12 09:28:58 -05:00
Brian Coca
061da7dc05 updated version_added 2016-01-12 08:27:33 -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
Alexey Wasilyev
d61772807c Add cpu_shares option for docker module 2016-01-12 09:59:36 +03: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
c284727eeb Merge pull request #2740 from Labutin/fix_doc_os_object 
Fix issue #2721: os_object parameters and docs don't align (file/filename)
 2016-01-11 18:47:19 -05:00
Brian Coca
e5d0c015eb Merge pull request #2715 from viglesiasce/gce-json-credentials 
Use JSON credentials for GCE modules
 2016-01-11 18:36:21 -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
Brian Coca
4be34067de added versions note in description for new choice 2016-01-11 18:14:37 -05:00
Brian Coca
c1df014e3b Merge pull request #2485 from sebi-hgdata/sebi/docker_unless_stopped 
added unless stopped option to docker module
 2016-01-11 18:09:24 -05:00
Brian Coca
94101a7271 Merge pull request #2398 from luto/feature/vsphere_guest/facts_power_status 
vsphere_guest: add power status to facts
 2016-01-11 18:04:23 -05:00
Brian Coca
f1754fb51e Merge pull request #2376 from mtpereira/fix_2351 
Add support for legacy registries to pull_image().
 2016-01-11 18:03:51 -05:00
Brian Coca
d2c520de91 Merge pull request #2789 from dddpaul/docker_timeout 
Add "timeout" option to Docker module
 2016-01-11 17:57:44 -05:00
Matt Davis
068c55ea0e Merge pull request #2711 from tksarah/azure_modify 
Fix azure.py, "ResetPasswordOnFirstLogon parameter is deprecated"
 2016-01-11 11:33:34 -08: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
Brian Coca
f312f48937 Merge pull request #2759 from chrrrles/nolog 
adding no_log to vsphere_guest password
 2016-01-11 09:33:00 -05:00
Pavel Derendyaev
61fdb52039 Add "timeout" option to Docker module 2016-01-09 21:59:23 +03:00
Sebastien Couture
22b6e6a0ce moved code that gets the vm's current hard drive profile and checks if vm_disk definition count is higher than actual vm drive count out of for loop for efficiency 2016-01-08 17:22:50 -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
Dmitry Labutin
35d32c9378 Fix issue #2721: os_object parameters and docs don't align (file/filename) 2015-12-29 10:31:14 +03: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
Sebastien Couture
080b158a29 Added support for resizing disks when state is 'reconfigured' 2015-12-23 15:42:00 -05:00
Vic Iglesias
5a0965cfcd Update GCE PEM deprecation text and examples 2015-12-23 11:37:12 -08:00
Marios Andreopoulos
d3ef2ef11f fix: do not set scopes account to service account used for instance creation 2015-12-22 19:54:05 +02:00
Brian Coca
907b7f7cf4 fix bad linebreak 2015-12-22 11:08:43 -05:00
Charles Paul
5e91c7b4d4 adding no_log to password 2015-12-22 10:01:01 -06:00
Michael Scherer
90f8228fb1 Fix #2629, replace choices=BOOLEANS by type='bool' 2015-12-22 16:10:01 +01:00
Vic Iglesias
6cbcb8f8ae Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into HEAD 2015-12-21 12:20:50 -06:00
Vic Iglesias
ec178225b0 Use credentials_file for GCE module auth config 2015-12-21 12:09:29 -06:00
Sam Thursfield
6e9adc4687 os_server: Add some error checking for the 'nics' parameter 
If this parameter was not of the right type, the module would fail with a
traceback, with a "AttributeError: 'str' object has no attribute 'get'"
exception.

It now gives a proper error message on type errors.
 2015-12-21 12:53:43 +00:00
sebi
aa15231cb7 added unless stopped option 2015-12-21 11:55:06 +02:00
tksarah
e022b7418e Edit azure.py 2015-12-20 11:10:39 +00:00
tksarah
215632d565 Edit azure.py 2015-12-20 10:15:01 +00:00
Toshio Kuratomi
fcb3397df7 Fix up documentation 2015-12-18 22:22:55 -08:00
Toshio Kuratomi
15c1c0cca7 entrypoint feature added in 2.1 2015-12-18 21:28:01 -08:00
Toshio Kuratomi
2220dc8e12 Merge pull request #2185 from AndrewPashkin/add_entrypoint_param_to_docker_module 
Add entrypoint parameter to docker module
 2015-12-18 21:25:14 -08:00
Toshio Kuratomi
ba3ee25172 labels is actually not aded in 1.9.4 but in 2.1 2015-12-18 17:57:17 -08:00
Omar Khan
19ebc45364 Add stop_timeout option to docker module 2015-12-18 17:51:31 -08:00
Toshio Kuratomi
d907f889a3 Merge pull request #1972 from yannh/docker-restarted 
Docker module: restarted should update the container when necessary
 2015-12-18 17:42:35 -08: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
Toshio Kuratomi
581b4f6de6 Add version_added to documentation 2015-12-18 16:34:16 -08:00
Joe Quadrino
8fe5d6f7ef add devices parameter for docker module 2015-12-18 16:34:16 -08:00
Pedro Romano
1bd04f797e GCE libcloud 0.15 support and code cleanup 
* Code formatting (indentation and white space) fixes for improved PEP8 conformity.
* Remove redundant backslashes inside parentheses.
* Test for object identity should be 'is not None'.
* Test for membership should be 'not in'.
* Fit docstring to the PEP8 79 character limit.
* Use forward compatible Python 2.6+ 'except .. as' syntax for exception handling.
* Support libcloud > 0.15 'metadata' argument format.
 2015-12-18 16:23:12 -08:00
Brian Coca
23c4297c96 Merge pull request #2703 from agireud/fix_boot_volume 
Update root_volume variable
 2015-12-18 09:21:29 -05:00
Chrrrles Paul
92fd2a9436 Merge pull request #2564 from luto/feature/vsphere_guest/support_nested_folders 
vsphere_guest: support putting a guest into a nested folder
 2015-12-17 11:47:08 -06:00
Alberto Gireud
9cc67e45a6 Update root_volume variable 2015-12-17 07:21:17 -06:00
Toshio Kuratomi
f04cd88d22 Fix os_server docs build 2015-12-16 08:06:29 -08:00
Donovan Jones
cf061dd93a fix typo in os_server security_groups description 2015-12-16 15:20:55 +13:00
Chrrrles Paul
e252fffb92 Merge pull request #2689 from tsmolka/patch1 
Making cluster parameter optional
 2015-12-15 14:32:44 -06:00
Brian Coca
6b13da738b updated module docs, added choices to state 2015-12-15 08:43:49 -05:00
Brian Coca
a6223ba43c Merge pull request #2577 from emonty/pass-volume-args 
Pass volume args to OpenStack Server creation
 2015-12-15 08:34:29 -05:00
Brian Coca
4e8d04d248 Merge pull request #2159 from leonty/devel 
Support 'labels' parameter for docker.
 2015-12-15 08:32:37 -05:00
Monty Taylor
187a4bd505 Add support for network, boot_from_volume and volumes 
nics is a great flexible parameter, but it's wordy. Shade now supports
a simple parameter too, which is just "network" and takes a name or id.
Add passthrough support.

In addition to supporting booting from a pre-existing volume, nova and
shade both support the concept of booting from volume based on an image.
Pass the parameters through.

Shade supports boot-time attachment of additional volumes for OpenStack
instances. Pass through the parameter so that ansible users can also
take advantage of this.
 2015-12-15 07:32:28 -05:00
Tobias Smolka
0cacadb670 Making cluster parameter optional 2015-12-15 12:45:51 +01:00
Brian Coca
1590f49618 Merge pull request #2655 from traveloka/fix-ec2-vol 
Set the argument type for ec2_vol's encrypted parameter
 2015-12-14 23:10:27 -05:00
Brian Coca
a876704740 Merge pull request #2239 from boushley/devel 
Fix issue with comparing versions improperly
 2015-12-14 21:59:27 -05:00
Brian Coca
0250ea1507 Merge pull request #2097 from phanect/gcenet-errormsg 
Error message & doc improvement for ipv4_range
 2015-12-14 21:38:27 -05:00
Timothy R. Chavez
05e16c950d Pass network argument to add_ips_to_server 
The `network` argument needs to be passed through `add_ips_to_server`
so that the default value can be properly overridden from ansible.
 2015-12-13 09:30:20 -08:00
Brian Coca
ed43b66d77 made note that Z/z are only 2.1 options 2015-12-12 13:04:01 -05:00
Brian Coca
38d651fb82 Merge pull request #2455 from solidm/selinux 
Add support for 'z' and 'Z' option for volumes for selinux hosts
 2015-12-12 12:59:27 -05:00
Brian Coca
f680076686 Merge pull request #2663 from timrchavez/fix_add_ips_to_server 
Get new server object after adding floating IP
 2015-12-11 15:04:17 -05:00
Chrrrles Paul
a56d652c7b Merge pull request #2196 from fennm/vmware_clone_to_folder 
Support cloning VMs into a specific VM folder
 2015-12-11 09:52:42 -05:00
Chrrrles Paul
b4254fe1a4 Merge pull request #2182 from serialdoom/devel 
vsphere: automatically add new drives
 2015-12-11 09:47:45 -05:00
Timothy R. Chavez
b9fe8166fd Get new server object after adding floating IP 
We need a new server object once we add the floating ip, otherwise we
will be operating with the older server object pre-floating-ip
assignment.
 2015-12-10 13:01:57 -06: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
Vladimir Mihailenco
366e6ab360 rackspace: set headers when uploading files to CF. 
Otherwise CDN (Akamai) downloads file without the headers. The sequence
is following:
1. Ansible uploads file to CF.
2. Akamai downloads the file and caches it in CDN.
3. Ansible sets headers.

As a result Akamai serves file without headers.

This is backwards incompatible change, because headers keys are not
prefixed with `x-object-meta-`. Which allows user to set headers like
`Access-Control-Allow-Origin`.
 2015-12-08 18:11:37 +02: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
ead1028256 Merge pull request #2565 from suonto/devel 
Removed unneccessary permission greed
 2015-11-30 09:22:54 -08: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
luto
794911c592 vsphere_guest: support putting a guest into a nested folder 2015-11-27 20:04:20 +01:00
Markus Suonto
32edc2f56f fixed quantum_ modules to work with minimum access rights if greater access rights are not needed 2015-11-26 15:34:47 +02:00
Brian Coca
9c30ef8926 doc updates 
- added version_added to new api_token
- updated notes to explain API issues, option switch and versions affected.
 2015-11-25 23:48:02 -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
Brian Coca
c428483b24 updated docs to denote retirement of v1 api and clarify when and why auth fields have changed 2015-11-26 09:41:33 -08:00
luto
7f01600813 vsphere_guest: when creating a guest, gather facts about it *before* disconnect 2015-11-25 17:14:19 +01:00
Lippy Lee
b2ace272a5 Make digital_ocean_domain use API v2 2015-11-25 22:10:31 +08: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
Matt Martz
03035d7a31 Merge pull request #2524 from Shrews/os_image 
Bug fix for os_image and min_disk/min_ram
 2015-11-23 16:45:11 -06: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
David Shrewsbury
d13741314e Bug fix for os_image and min_disk/min_ram 
The min_disk and min_ram parameters were not being passed to
the shade API. They also need to be integer values. Also
updated the description of these parameters for better
clarification.
 2015-11-23 11:29:00 -05:00
Will Rouesnel
7237798f20 docker: Fix state=reloaded to detect default LoggingDriver for docker 
Previously the logging module hard coded the default logging driver. This means
if the docker daemon is started with a different logging driver, the ansible
module would continually restart it when run.

This fix adds a call to docker.Client.info(), which is inspected if a logging
driver is not supplied in the playbook, and the container only restarted if
the logging driver applied differs from the configured default.

In usage, this has solved issues with using alternative logging drivers.
 2015-11-24 00:30:42 +11: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
Brian Coca
88e0bfd75d Merge pull request #2492 from Shrews/os_user_group 
Fix os_user_group module
 2015-11-18 12:55:40 -08: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
David Shrewsbury
2a306c6b8c Fix os_user_group module 
This module had a couple of errors in it. Also added check mode
support.
 2015-11-18 15:03:07 -05: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
Chrrrles Paul
b1c0249045 Merge pull request #2409 from stewrutledge/reconfnetwork 
Added support for reconfiguring network
 2015-11-17 09:51:14 +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
Steve Spencer
fc5da26dee Sync up with allowable docker volume mounting modes 2015-11-12 10:42:26 +02: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
Steve Spencer
2c95641d66 Add support for mounting host volumes with Z and z options 2015-11-11 16:44:01 +02: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
Monty Taylor
ccb39767cf Use add_ips_to_server API 
This module is still using an old pre-release API and needs to update
to use the current API.

Co-Authored-By: Marton Kiss <marton.kiss@gmail.com>
 2015-11-09 11:38:04 -05: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
Toshio Kuratomi
f2943bd404 Add zfil as an owner of the docker module 2015-11-06 21:18:46 -08:00
Toshio Kuratomi
4ed7b690f6 Add a new contributor as a maintainer of the docker module 2015-11-06 10:53:33 -08:00
Toshio Kuratomi
750aa16a06 Merge pull request #2093 from zfil/fix_facts 
docker module: fix regressions introduced by f38186c and 80aca4b
 2015-11-06 10:20:20 -08: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
Brian Coca
1f9c204178 Merge pull request #2379 from larsks/feature/os_server_facts_returns_list 
os_server_facts returns facts about multiple servers
 2015-11-05 12:50:29 -05:00
Stewart Rutledge
adbc430984 Added support for reconfiguring network (moving to another switch, for example) 2015-11-04 14:22:08 +01:00
Leonty
cff83dd257 Merge remote-tracking branch 'upstream/devel' into devel 2015-11-04 12:48:14 +03:00
Leonty
5b904c1401 Corrected misspelling in the 'labels' docker parameter documentation. 2015-11-04 12:43:03 +03: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