You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/06/23 11:56:49 UTC

[1/2] brooklyn-docs git commit: Added machine naming in locations

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master 84ab276e6 -> 9f2f0cf35


Added machine naming in locations


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

Branch: refs/heads/master
Commit: 0ab362c1bdf009dfa7795cba75e0fe90979a37a0
Parents: 4cfb123
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Fri Jun 10 11:03:22 2016 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Fri Jun 10 11:03:22 2016 +0100

----------------------------------------------------------------------
 guide/ops/locations/_clouds.md | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/0ab362c1/guide/ops/locations/_clouds.md
----------------------------------------------------------------------
diff --git a/guide/ops/locations/_clouds.md b/guide/ops/locations/_clouds.md
index 8d04599..4072a1a 100644
--- a/guide/ops/locations/_clouds.md
+++ b/guide/ops/locations/_clouds.md
@@ -240,11 +240,23 @@ Here you can see that we set three template options:
 If the method call cannot be matched to the template options available - for example if you are trying to set an AWS EC2
 specific option but your location is an OpenStack cloud - then a warning is logged and the option is ignored.
 
+###### Cloud Machine Naming
 
-See the following resources for more information:
+The name that Apache Brooklyn generates for your virtual machine will, by default, be based on your Apache Brooklyn server name and the IDs of the entities involved. This is the name you see in places such as the AWS console and will look something like:
+
+    brooklyn-o8jql4-machinename-rkix-tomcat-wi-nca6-14b
+
+If you have created a lot of virtual machines, this kind of naming may not be helpful. This can be changed using the following YAML in your location's `brooklyn.config`:
+
+    cloudMachineNamer: org.apache.brooklyn.core.location.cloud.names.CustomMachineNamer
+    custom.machine.namer.machine: My-Custom-Name-${entity.displayName}
+
+A [FreeMarker](http://freemarker.org/) format is used in `custom.machine.namer.machine` which can take values from places such as the launching entity or location.
+
+The above example will create a name such as:
+
+    My-Custom-Name-Tomcat
+    
+Allowing you to more easily identify your virtual machines.
 
-- [AWS VPC issues which may affect users with older AWS accounts](vpc-issues.html)
-- [Amazon EC2 and Amazon Virtual Private Cloud](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-vpc.html#vpc-only-instance-types)
-- [Your Default VPC and Subnets](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/default-vpc.html)
-- [Amazon VPC FAQs](http://aws.amazon.com/vpc/faqs/#Default_VPCs)
   
\ No newline at end of file


[2/2] brooklyn-docs git commit: This closes #77

Posted by al...@apache.org.
This closes #77


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

Branch: refs/heads/master
Commit: 9f2f0cf3517eb8154561b710050853d853fff7a1
Parents: 84ab276 0ab362c
Author: Aled Sage <al...@gmail.com>
Authored: Thu Jun 23 12:56:10 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Jun 23 12:56:10 2016 +0100

----------------------------------------------------------------------
 guide/ops/locations/_clouds.md | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------