Repository: brooklyn-docs Updated Branches: refs/heads/0.9.0 e7ef6802a -> 24dea0ca9
Corrected brooklyn references Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/dd5bf5cd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/dd5bf5cd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/dd5bf5cd Branch: refs/heads/0.9.0 Commit: dd5bf5cd710e426a95d0da6d92a0c8bc40ee94ac Parents: e7ef680 Author: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Authored: Mon Apr 4 16:27:25 2016 +0100 Committer: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Committed: Thu May 12 11:17:12 2016 +0100 ---------------------------------------------------------------------- guide/ops/locations/clouds.md | 2 +- guide/ops/persistence/index.md | 2 +- guide/start/running.md | 2 +- guide/yaml/chef/about-chef.md | 4 ++-- website/documentation/increase-entropy.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/dd5bf5cd/guide/ops/locations/clouds.md ---------------------------------------------------------------------- diff --git a/guide/ops/locations/clouds.md b/guide/ops/locations/clouds.md index 08109e0..89195fa 100644 --- a/guide/ops/locations/clouds.md +++ b/guide/ops/locations/clouds.md @@ -59,7 +59,7 @@ Brooklyn to use specific credentials for the initial login to a cloud-provisione (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 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 +the root password. This setting tells Apache Brooklyn 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, or is the password reset first (the latter means Brooklyn can never ssh to the VM). With this property, http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/dd5bf5cd/guide/ops/persistence/index.md ---------------------------------------------------------------------- diff --git a/guide/ops/persistence/index.md b/guide/ops/persistence/index.md index 58b5915..30c3d5f 100644 --- a/guide/ops/persistence/index.md +++ b/guide/ops/persistence/index.md @@ -367,7 +367,7 @@ An example script to be invoked by CRON is shown below: BACKUP_FILENAME=/path/to/archives/back-${DATE}.tar.gz TEMP_DATA_DIR=/path/to/tempdir - amp copy-state \ + brooklyn copy-state \ --persistenceLocation named:my-persistence-location \ --persistenceDir /path/to/bucket \ --destinationDir $TEMP_DATA_DIR http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/dd5bf5cd/guide/start/running.md ---------------------------------------------------------------------- diff --git a/guide/start/running.md b/guide/start/running.md index 0518743..3464023 100644 --- a/guide/start/running.md +++ b/guide/start/running.md @@ -55,7 +55,7 @@ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant For Centos 7 and RHEL 7 users, the recommended way to install Apache Brooklyn on RPM-based Linux distributions is by using the RPM package. -RPM is the de facto standard for packaging software on these Linux distributions and provides a mechanism for installing, upgrading and removing packages such as Apache Brooklyn. The AMP package contains all the necessary files associated with the Apache Brooklyn application. +RPM is the de facto standard for packaging software on these Linux distributions and provides a mechanism for installing, upgrading and removing packages such as Apache Brooklyn. The RPM package contains all the necessary files associated with the Apache Brooklyn application. Download the Apache Brooklyn [RPM distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"}. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/dd5bf5cd/guide/yaml/chef/about-chef.md ---------------------------------------------------------------------- diff --git a/guide/yaml/chef/about-chef.md b/guide/yaml/chef/about-chef.md index db3ec3c..8f87d07 100644 --- a/guide/yaml/chef/about-chef.md +++ b/guide/yaml/chef/about-chef.md @@ -38,13 +38,13 @@ the server. This is not the case - the bootstrap operation does not involve `kni itself to the server, passing on its configuration. This diagram summarises the interaction between Brooklyn, the new node, and the various Chef tools. Note that there -is no interaction between the AMP Server and the Chef Server. +is no interaction between the Apache Brooklyn Server and the Chef Server. [](chef-call-flow.png) ### How Brooklyn interacts with Chef Brooklyn understands both the *server* and *solo* modes of operation. Server mode utilises the `knife` toolkit, and -therefore `knife` must be installed onto the AMP server and configured appropriately. Solo mode does not have any +therefore `knife` must be installed onto the Apache Brooklyn server and configured appropriately. Solo mode does not have any special requirements; when running in solo mode, Brooklyn will install and configure the Chef client over SSH, just like it does most other kinds of entities. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/dd5bf5cd/website/documentation/increase-entropy.md ---------------------------------------------------------------------- diff --git a/website/documentation/increase-entropy.md b/website/documentation/increase-entropy.md index 53d5768..c269f32 100644 --- a/website/documentation/increase-entropy.md +++ b/website/documentation/increase-entropy.md @@ -2,7 +2,7 @@ title: Increase Entropy layout: website-normal --- -If you are installing AMP on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure `rng-tools` or just use /dev/urandom`. +If you are installing Apache Brooklyn on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure `rng-tools` or just use /dev/urandom`. ### Installing rng-tool if you are using a RHEL-based OS:
