Commit graph

1976 commits

Author SHA1 Message Date
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
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
Evan Carter
70ed99ec26 Fixing bug #2058 and adding some backwards compatibility 2015-09-14 11:27:37 -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
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
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
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
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
David Dyball
a0a374b8ca Updated PR based on comments 2015-09-08 16:19:26 +01: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
Victor Costan
2ae37e7845 os_server: nice error when flavor not found
When we can't find the VM flavor that the user requests, this change replaces the non-descript stack trace with a clear error message.
2015-09-04 20:46:26 -04: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
6e5a832dc2 Fix read-only usage to depend on the docker-py and docker server version 2015-09-04 15:59:19 -07:00
Toshio Kuratomi
a4149a37ba Merge pull request #2011 from ansible/docker-merge-hostconfig-methods
We had two separate methods trying to do the same thing but neither o…
2015-09-04 12:37:17 -07:00
Brian Coca
8f31323b5c Merge pull request #1862 from SinisterLight/devel
checking remote_group_id while comparing os_security_group_rule
2015-09-04 12:48:59 -04:00
Toshio Kuratomi
1f358f349b We had two separate methods trying to do the same thing but neither one was complete. This merges them so that all of the options get parsed and applied. 2015-09-03 15:39:18 -07: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
James Martin
c54f875fdd Adds sanity check to make sure nics is a list. 2015-09-02 11:02:31 -05:00
Charles Paul
6a40e8b454 vm_floppy 2.0 support 2015-09-01 14:53:11 -05:00
Chrrrles Paul
8ebd6cc7cd Revert "Add 2.0 docs - Revert "add virtual floppy to VMware guest"" 2015-09-01 10:55:10 -05:00
Chrrrles Paul
3830af652f Revert "add virtual floppy to VMware guest" 2015-09-01 10:47:43 -05:00
Chrrrles Paul
943a892435 Merge pull request #1720 from nivanko/feature-virtual-floppy
Useful addition to vsphere_guest and the code looks good.  I will do more testing.  Merging into devel branch -- add virtual floppy to VMware guest
2015-09-01 09:26:20 -05:00
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
Chrrrles Paul
5fc4f9d876 Merge pull request #1982 from lowwalker/patch-2
Merging, good catch -- updated examples
2015-08-28 14:12:58 -05:00
Luke
40f2ff9fbf removed hyphens in module name in examples 2015-08-28 08:46:45 -04:00
Luke
a4aa29edd9 updated examples
When testing with existing example, I received errors about auth block not being ingested. After adding the auth block, name and state with "=" caused syntax errors.
2015-08-28 08:34:05 -04: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