You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/11/17 11:29:58 UTC

[2/3] brooklyn-docs git commit: address PR comments, fix yaml

address PR comments, fix yaml


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

Branch: refs/heads/master
Commit: 3f3e41d6d5253d2280617390ee5c75dabb72f3c4
Parents: 3306aae
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 16 18:08:15 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Nov 16 18:08:15 2017 +0000

----------------------------------------------------------------------
 guide/locations/_AWS.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3f3e41d6/guide/locations/_AWS.md
----------------------------------------------------------------------
diff --git a/guide/locations/_AWS.md b/guide/locations/_AWS.md
index 074adf0..070f2df 100644
--- a/guide/locations/_AWS.md
+++ b/guide/locations/_AWS.md
@@ -49,10 +49,10 @@ You can specify a `keyPair` to use for initial provisioning as a configuration o
 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 if you are optimizing for creation of many machines,
-or you are using an image where keypair installation is not reliable (such as [some
-RightImages](https://issues.apache.org/jira/browse/JCLOUDS-1356)), then you may wish
-to use a registered key pair.
+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 
@@ -77,14 +77,15 @@ brooklyn.catalog:
   - id: aws-us-east-1
     item:
       type: aws-base
-      region: us-east-1
-      keyPair: XXXXXXXXX
-      login.privateKeyData: |
-        -----BEGIN RSA PRIVATE KEY-----
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        -----END RSA PRIVATE KEY-----
+      brooklyn.config:
+        region: us-east-1
+        keyPair: XXXXXXXXX
+        loginUser.privateKeyData: |
+          -----BEGIN RSA PRIVATE KEY-----
+          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          -----END RSA PRIVATE KEY-----
 ```