Commit graph

7741 commits

Author SHA1 Message Date
James Cammarata
570e74bb1a Merge pull request #2090 from halberom/doc_fix_ec2_tag
docs - ec2_tag.py
2015-09-16 09:56:10 -04: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
Toshio Kuratomi
d4e16b0c73 Rename powershell versions of setup and slurp so they don't shadow the python versions of these modules.
This change goes along with https://github.com/ansible/ansible/02502c5727753d02819cb32b94dc2035b65d81a7
2015-09-15 14:22:19 -07:00
Chris Church
0e3f7c92d7 Fix win_lineinfile to pass integration tests when strict mode is enabled. 2015-09-15 16:26:15 -04: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
David Shrewsbury
ef93fb1c14 More os_router module cleanup and fixes.
Added a RETURN section, corrected version_added value, removed use of
'result' in exit_json() calls.
2015-09-14 16:20:18 -04:00
Brian Coca
a0997e8940 Merge pull request #1757 from gutoandreollo/devel
Added the 'hw_interfaces' array
2015-09-14 15:08:47 -04:00
Brian Coca
b2e5dd2c47 Merge pull request #1807 from brannon/supportVMClones
Support cloning VMs (in addition to templates)
2015-09-14 14:26:48 -04:00
James Cammarata
fd46b354ef Merge pull request #2071 from evanccnyc/devel
EC2_EIP Fixing bug #2058 and adding some backwards compatibility
2015-09-14 11:47:22 -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
Brian Coca
81a7243bbb changed chmod to 2.4 compat 2015-09-14 09:54:38 -04:00
Brian Coca
f12a2135ca Merge pull request #1525 from mjuenema/devel
Removed check whether destination directory is writable from files/un…
2015-09-14 09:01:36 -04: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
skylerbunny
489f3e67f1 Explanation of privilege escalation in notes
An attempt to make clear how privilege escalation works with respect to the src/source host and dest/destination host. One existing note was incorporated into three new ones, iterating each.
2015-09-12 13:13:48 -07:00
Brian Coca
813053c51c Merge pull request #986 from ssssam/cron-permissions-fix
Fix permissions issue with 'cron' module
2015-09-11 16:37:16 -04:00
Phil
21f56aef77 merge devel and fix conflicts 2015-09-11 14:23:03 -05:00
James Cammarata
4de4bd0be6 Merge pull request #465 from bbaumer/devel
SVN 1.7 Support, ignore svn:externals on local mod check and new switch toggle
2015-09-11 13:10:33 -04:00
James Cammarata
310cf77edc Merge pull request #1947 from astorije/astorije/fix-acl
Fix the acl module
2015-09-11 13:06:19 -04:00
Brian Coca
cf2be9607c Merge pull request #533 from thataustin/devel
Updating rubygems --no-document param
2015-09-11 11:21:27 -04:00
Brian Coca
853d4f3d78 Merge pull request #2041 from slmingol/patch-1
Update get_url.py
2015-09-10 21:17:49 -04:00
Brian Coca
beb60133ba Merge pull request #2042 from abithap/devel
Add support for port-id,port-name to nics in os_server
2015-09-10 21:15:23 -04:00
Brian Coca
14ebc19897 fixed doc issues with win_lineinfile 2015-09-10 16:18:35 -04: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
Abitha Palaniappan
f449a0f48c Add support for port-id,port-name to nics in os_server 2015-09-09 15:38:39 -07:00
Sam Mingo
7982d582d9 Update get_url.py
Fixed typo with header parameter to get_url in the documentation.
2015-09-09 17:38:05 -04:00
Brian Coca
1c7e8ef1a0 Merge pull request #2034 from pwnall/patch-2
Fix indentation in os_server documentation
2015-09-09 11:49:08 -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
Victor Costan
2cc431f791 Fix indentation in os_server documentation 2015-09-09 01:29:38 -04:00
Toshio Kuratomi
9363369a4c Merge pull request #1991 from daviddyball/devel
Docker module log-opt support
2015-09-08 13:27:36 -07:00
Toshio Kuratomi
cca455c279 Merge pull request #1994 from hutchic/patch-1
[DOCUMENTATION] Remove the sample SHA256
2015-09-08 13:25:04 -07: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
Brian Coca
e4129a88bf Merge pull request #2031 from Yanchek99/devel
Fixed typo for instance_tags documentation
2015-09-08 12:44:12 -04:00
Yanchek99
7104096c7c Fixed typo for instance_tags documentation 2015-09-08 09:16:53 -07:00
Colin Hutchinson
ab50943887 Update get_url.py
use an abbreviated sha
2015-09-08 12:00:21 -04:00
David Dyball
a0a374b8ca Updated PR based on comments 2015-09-08 16:19:26 +01:00
Benno Joy
2fd511b906 Merge pull request #1839 from brianlloyd/win_lineinfile
Windows implementation of lineinfile and related documentation
2015-09-08 12:06:04 +05:30
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