Some more tweaks, mostly for the PDF
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/a47ab4ff Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/a47ab4ff Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/a47ab4ff Branch: refs/heads/master Commit: a47ab4ffd98d79fa4d17ad8146d608bbaebae9ff Parents: 0495733 Author: Richard Downer <[email protected]> Authored: Wed Oct 11 14:37:20 2017 +0100 Committer: Thomas Bouron <[email protected]> Committed: Mon Oct 16 14:56:04 2017 +0100 ---------------------------------------------------------------------- guide/ops/upgrade.md | 6 ++++++ guide/start/blueprints.md | 6 ++++++ guide/start/running.md | 9 +++++---- 3 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a47ab4ff/guide/ops/upgrade.md ---------------------------------------------------------------------- diff --git a/guide/ops/upgrade.md b/guide/ops/upgrade.md index d8064d7..21b5b39 100644 --- a/guide/ops/upgrade.md +++ b/guide/ops/upgrade.md @@ -31,6 +31,8 @@ Instead, code must be built and installed as [OSGi bundles](https://en.wikipedia {% endif %} {% sample lang="package" -%} +#### Upgrading an RPM or DEB package + 1. **Important!** Backup persisted state and custom configuration, in case you need to rollback to a previous version. 1. By default, persisted state is located at `/var/lib/brooklyn`. @@ -72,6 +74,8 @@ Instead, code must be built and installed as [OSGi bundles](https://en.wikipedia {% sample lang="tarball" -%} +#### Upgrading using a .tar.gz archive + 1. Stop Apache Brooklyn: ./bin/stop brooklyn @@ -142,6 +146,7 @@ Instead, code must be built and installed as [OSGi bundles](https://en.wikipedia {% endif %} {% sample lang="package" -%} +#### Upgrading an RPM or DEB package 1. Stop Apache Brooklyn: # CentOS 7 / RHEL @@ -265,6 +270,7 @@ Instead, code must be built and installed as [OSGi bundles](https://en.wikipedia 3. Update the catalog: `br catalog add /opt/brooklyn/catalog/catalog.bom`. {% sample lang="tarball" -%} +#### Upgrading using a .tar.gz archive Same instructions as above. {% endmethod %} http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a47ab4ff/guide/start/blueprints.md ---------------------------------------------------------------------- diff --git a/guide/start/blueprints.md b/guide/start/blueprints.md index fc05cd6..1ebd129 100644 --- a/guide/start/blueprints.md +++ b/guide/start/blueprints.md @@ -36,6 +36,8 @@ In order to configure the location in which Apache Brooklyn launches an applicat {% endif %} {% sample lang="vagrant" -%} +### Vagrant location + The Vagrant configuration described in [Running Apache Brooklyn](running.md), on the previous page is the recommended way of running this tutorial. This configuration comes with four blank vagrant configurations called byon1 to byon4. These can be launched by entering the following command into the terminal in the vagrant configuration directory. @@ -59,6 +61,8 @@ location: ``` {% sample lang="clouds" -%} +### A cloud location + Apache Brooklyn uses [Apcahe jclouds](http://jclouds.apache.org/) to support a range of cloud locations. More information on the range of providers and configurations is available [here]({{ book.path.guide }}/locations/#clouds). As an example, here is a configuration for [Amazon Web Services (AWS)](http://www.aws.amazon.com). Swap the identity and credential with your AWS account details, then replace the location in your "myapp.yaml" with this. @@ -71,6 +75,8 @@ location: ``` {% sample lang="byon" -%} +### "Bring your own nodes" location + The Bring Your Own Nodes (BYON) configuration allows Apache Brooklyn to make use of already available servers. These can be specified by a list of IP addresses with a user and password as shown below. More information including the full range of configuration options is available [here]({{ book.path.guide }}/locations/#byon). Replace the hosts, user and password in the example below with your own server details, then replace the location in your "myapp.yaml" with this. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a47ab4ff/guide/start/running.md ---------------------------------------------------------------------- diff --git a/guide/start/running.md b/guide/start/running.md index 93c96ad..2d1eaf8 100644 --- a/guide/start/running.md +++ b/guide/start/running.md @@ -126,12 +126,13 @@ to configure security. Documentation of configuration options include: ## Launch Apache Brooklyn -{% method -%} - -{% common -%} -**Important**: Before launching Apache Brooklyn, please check the `date` on the local machine. +> #### warning::Important +> +> Before launching Apache Brooklyn, please check the `date` on the local machine. Even several minutes before or after the actual time could cause problems. +{% method -%} + {% sample lang="vagrant" -%} ### Launching in Vagrant
