Repository: brooklyn-docs Updated Branches: refs/heads/master 134b7b38c -> 137e7565b
Update running.md Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/93ed5280 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/93ed5280 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/93ed5280 Branch: refs/heads/master Commit: 93ed52809629950ca2afa60245298d2d995a1d45 Parents: 7e3a262 Author: drigodwin <drigod...@googlemail.com> Authored: Fri Mar 25 18:52:40 2016 +0000 Committer: drigodwin <drigod...@googlemail.com> Committed: Fri Mar 25 18:52:40 2016 +0000 ---------------------------------------------------------------------- guide/start/running.md | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/93ed5280/guide/start/running.md ---------------------------------------------------------------------- diff --git a/guide/start/running.md b/guide/start/running.md index bebb76e..078189e 100644 --- a/guide/start/running.md +++ b/guide/start/running.md @@ -11,7 +11,9 @@ An overview of core [Brooklyn concepts](./concept-quickstart.html){:target="_bla Two methods of deployment are detailed in this tutorial, using virtualisation with Vagrant and an install in your own environment (such as your local machine or in your private/public cloud). -Both assume that you are using Linux or Mac OS X. To get you up-and-running quickly, the Vagrant option will provision four compute nodes for you to deploy applications to. +The latter assumes that you have a [Java Runtime Environment (JRE)](https://www.java.com){:target="_blank"} installed (version 7 or later), as Brooklyn is Java under the covers. + +To get you up-and-running quickly, the Vagrant option will provision four compute nodes for you to deploy applications to. ## Install Apache Brooklyn @@ -19,7 +21,9 @@ Both assume that you are using Linux or Mac OS X. To get you up-and-running quic <ul class="nav nav-tabs"> <li class="active impl-1-tab"><a data-target="#impl-1, .impl-1-tab" data-toggle="tab" href="#">Vagrant</a></li> - <li class="impl-2-tab"><a data-target="#impl-2, .impl-2-tab" data-toggle="tab" href="#">Install</a></li> + <li class="impl-2-tab"><a data-target="#impl-2, .impl-2-tab" data-toggle="tab" href="#">Centos / RHEL 7</a></li> + <li class="impl-3-tab"><a data-target="#impl-3, .impl-3-tab" data-toggle="tab" href="#">OSX / Linux</a></li> + <li class="impl-4-tab"><a data-target="#impl-4, .impl-4-tab" data-toggle="tab" href="#">Windows</a></li> </ul> <div class="tab-content"> @@ -47,20 +51,13 @@ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant </div> <div id="impl-2" class="tab-pane fade"> -<strong class="hidden started-pdf-include">b) Install</strong> - - -### Install the RPM package: +<strong class="hidden started-pdf-include">b) Centos / RHEL 7</strong> For Centos and RHEL (v7) users, the recommended way to install Apache Brooklyn on RPM-based Linux distributions is by using the RPM package. -If you are using another Linux distribution, refer to the ['Install from other distributions'](#install-from-other-distributions) steps. - RPM is the de facto standard for packaging software on most 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. -Download the Apache Brooklyn RPM distribution (CentOS 7, RHEL 7.x only): - - * [RPM](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"} +Download the Apache Brooklyn [RPM distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"} (CentOS 7, RHEL 7.x only): Once downloaded, run the following shell command: @@ -68,7 +65,11 @@ Once downloaded, run the following shell command: $ sudo yum install apache-brooklyn-{{site.brooklyn-version}}-1.rpm {% endhighlight %} -### Install from other distributions: +</div> +<div id="impl-3" class="tab-pane fade"> + +<strong class="hidden started-pdf-include">c) OSX / Linux</strong> + Other binary distributions are also available to [download]({{site.path.website}}/download/){:target="_blank"}. {% if brooklyn_version contains 'SNAPSHOT' %} Extract the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different): @@ -88,7 +89,15 @@ $ cd apache-brooklyn-{{ site.brooklyn.version }} {% endhighlight %} {% endif %} -**Note**: You'll need a [Java Runtime Environment (JRE)](https://www.java.com){:target="_blank"} installed (version 7 or later), as Brooklyn is Java under the covers. +</div> +<div id="impl-4" class="tab-pane fade"> + +<strong class="hidden started-pdf-include">d) Windows</strong> + +</div> +</div> + +--- It is not necessary at this time, but depending on what you are going to do, you may wish to set up other configuration options first: @@ -97,16 +106,13 @@ you may wish to set up other configuration options first: * [Persistence](../ops/persistence/) * [Cloud credentials](../ops/locations/) -</div> -</div> - ---- - ## Launch Apache Brooklyn <ul class="nav nav-tabs"> <li class="active impl-1-tab"><a data-target="#impl-1, .impl-1-tab" data-toggle="tab" href="#">Vagrant</a></li> - <li class="impl-2-tab"><a data-target="#impl-2, .impl-2-tab" data-toggle="tab" href="#">Install</a></li> + <li class="impl-2-tab"><a data-target="#impl-2, .impl-2-tab" data-toggle="tab" href="#">Centos / RHEL</a></li> + <li class="impl-3-tab"><a data-target="#impl-3, .impl-3-tab" data-toggle="tab" href="#">OSX / Linux</a></li> + <li class="impl-4-tab"><a data-target="#impl-4, .impl-4-tab" data-toggle="tab" href="#">Windows</a></li> </ul> <div class="tab-content">
