Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tbouron@apache.org
To: commits@brooklyn.apache.org
Date: Fri, 17 Nov 2017 11:40:41 -0000
Message-Id: <5e738585e717492388dc3b76b51ff362@git.apache.org>
In-Reply-To: <2293b4f0f6c64b6b92d50654f65b6e30@git.apache.org>
References: <2293b4f0f6c64b6b92d50654f65b6e30@git.apache.org>
Subject: [2/2] brooklyn-docs git commit: This closes #238
archived-at: Fri, 17 Nov 2017 11:40:42 -0000

This closes #238


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2c20b30f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2c20b30f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2c20b30f

Branch: refs/heads/master
Commit: 2c20b30f205939b71df5d49284f146564ac368f4
Parents: d00c98a 23007cc
Author: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Authored: Fri Nov 17 11:40:34 2017 +0000
Committer: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Committed: Fri Nov 17 11:40:34 2017 +0000

----------------------------------------------------------------------
 guide/locations/_AWS.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2c20b30f/guide/locations/_AWS.md
----------------------------------------------------------------------
diff --cc guide/locations/_AWS.md
index 070f2df,b561d6a..e9a4ee8
--- a/guide/locations/_AWS.md
+++ b/guide/locations/_AWS.md
@@@ -42,53 -42,23 +42,69 @@@ Below are examples of configuration opt
    [security groups](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html).
    For example, `securityGroups: mygroup1` or `securityGroups: [ mygroup1, mygroup2 ]`.
  
+ ### EBS boot volume size
+ 
+ The size of the EBS boot volume for a VM can be specified using `mapNewVolumeToDeviceName` in `templateOptions` as shown below:
+ 
+     location:
+       jclouds:aws-ec2:
+         region: ...
+         templateOptions:
+           mapNewVolumeToDeviceName:
+            - /dev/sda1
+            - 123
+            - true
+ 
+ Where `/dev/sda1` is the device name of the boot volume on the selected AMI, `123` is the size of the volume in gigabytes 
+ and `true` is a boolean indicating the volume should be deleted on VM termination.
+         
  
 +### Using a Registered Key Pair
 +
 +You can specify a `keyPair` to use for initial provisioning as a configuration option.
 +If this is omitted, Brooklyn will use jclouds to create a new ad hoc key pair at AWS
 +for that machine, and it will delete it afterwards.  This is usually seamless and
 +occurs behind the scenes, with the post-provision user set up and configured as normal
 +for all locations.  However using AWS heavily or optimizing creation, using a known
 +key pairs can  
 +[make some images](https://issues.apache.org/jira/browse/JCLOUDS-1356) more reliable
 +and speed things up.
 +
 +First, in the AWS Console, open the EC2 service in the region you are interested in,
 +then click "Key Pairs" at the left.  For `us-east-1`, the link is 
 +[here](https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#KeyPairs:sort=keyName).
 +Click "Create Key Pair" (or "Import Key Pair" if you want to provide a public key) and
 +follow the instructions.
 +
 +Then define your location as follows for `aws-us-east-1`.  Make sure to replace the
 +`XXXX` sections with the key-pair name defined above and the corresponding private key data. 
 +
 +```yaml
 +brooklyn.catalog:
 +  version: "1.0"
 +  itemType: location
 +  items:
 +  - id: aws-base
 +    item:
 +      type: jclouds:aws-ec2
 +      brooklyn.config:
 +        identity: XXXXXXXXXXXXXXXX
 +        credential: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
 +  - id: aws-us-east-1
 +    item:
 +      type: aws-base
 +      brooklyn.config:
 +        region: us-east-1
 +        keyPair: XXXXXXXXX
 +        loginUser.privateKeyData: |
 +          -----BEGIN RSA PRIVATE KEY-----
 +          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 +          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 +          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 +          -----END RSA PRIVATE KEY-----
 +```
 +
 +
  ### Using Subnets and Security Groups
  
  Apache Brooklyn can run with AWS VPC and both public and private subnets.