You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/10/26 12:16:42 UTC
[2/7] incubator-brooklyn git commit: Add definition of "vCD" to
Locations page.
Add definition of "vCD" to Locations page.
This was one of the observations from the Belfast team First Encounter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5f609df3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5f609df3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5f609df3
Branch: refs/heads/master
Commit: 5f609df3a99af204cad97cb1be6918766d56a5f7
Parents: c9bc03c
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Oct 19 18:04:17 2015 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Oct 19 18:04:17 2015 +0100
----------------------------------------------------------------------
docs/guide/ops/locations/index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5f609df3/docs/guide/ops/locations/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/locations/index.md b/docs/guide/ops/locations/index.md
index db3cbd1..9817605 100644
--- a/docs/guide/ops/locations/index.md
+++ b/docs/guide/ops/locations/index.md
@@ -76,7 +76,7 @@ The keys `loginUser` and either `loginUser.password` or `loginUser.privateKeyFil
Brooklyn to use specific credentials for the initial login to a cloud-provisioned machine.
(This custom login is particularly useful when using a custom image templates where the cloud-side account
-management logic is not enabled. For example, a vCD template can have guest customization that will change
+management logic is not enabled. For example, a vCloud (vCD) template can have guest customization that will change
the root password. This setting tells AMP to only use the given password, rather than the initial
randomly generated password that vCD returns. Without this property, there is a race for such templates:
does Brooklyn manage to create the admin user before the guest customization changes the login and reboots,