Skip to content

Commit

Permalink
updated to describe Brooklyn OSGi installation
Browse files Browse the repository at this point in the history
the `brooklyn.sh` code is still present but not referred to in docs, as non-OSGi is now deprecated in Apache Brooklyn
  • Loading branch information
ahgittin committed Apr 5, 2019
1 parent cf186e7 commit 109e9a5
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 37 deletions.
19 changes: 13 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ This package provides support for [Apache Brooklyn](http://brooklyn.io)
to understand [OASIS TOSCA](https://www.oasis-open.org/committees/tosca/) plans,
using [Alien4Cloud](http://alien4cloud.github.io).

It can be run as a standalone file, launching Brooklyn, or the JAR dropped in to your own Brooklyn.
This builds a plugin JAR that installs in to Apache Brooklyn.
This also builds a graphical TOSCA client that connects to Apache Brooklyn.


## Build Notes
Expand All @@ -22,18 +23,24 @@ compare with the version at [ahgittin/alien4cloud misc branch](https://github.co

Then simply:

mvn clean install assembly:single
mvn clean install


## Running

See the README.md file in the resulting archive (in `target`) for runtime instructions.
You may also find that file [here](brooklyn-tosca-dist/src/main/assembly/files/README.md).
Once the project is built:

* To install TOSCA backend support into Apache Brooklyn, see the instructions in the [`karaf/init`](karaf/init/README.md) project
that builds a plugin to Apache Brooklyn.

## TODO Tasks
* To build and run a graphical TOSCA client, unpack the `brooklyn-tosca-dist` archive (in the `tar.gz` in that project's `target/`),
and consult the `README.md` there. You can also find that file [here](brooklyn-tosca-dist/src/main/assembly/files/README.md).
Note this requires a different configuration for the plugin installed to Apache Brooklyn.

### Very Soon

## Roadmap

### Backlog

* add catalog items from TOSCA specs, one by one or by import

Expand Down
45 changes: 14 additions & 31 deletions brooklyn-tosca-dist/src/main/assembly/files/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
brooklyn-tosca
brooklyn-tosca - graphical client dist
===

## Overview
Expand All @@ -7,24 +7,13 @@ This distribution provides support for [Apache Brooklyn](http://brooklyn.io)
to understand [OASIS TOSCA](https://www.oasis-open.org/committees/tosca/) plans,
using [Alien4Cloud](http://alien4cloud.github.io).

This project builds the TOSCA (Alien4Cloud) graphical client configured for use with Apache Brooklyn.

## Running
To support TOSCA in Apache Brooklyn this client is not necessary; see the instructions at
[the root of this project](https://github.com/cloudsoft/brooklyn-tosca/blob/master/README.md).

### Quickstart: No Alien4Cloud UI

In the unpacked archive, the simplest way to get started is to run with:

nohup ./brooklyn.sh launch &

This will launch the Alien4Cloud core platform embedded, using `~/.brooklyn/alien4cloud/` as the repository.
Brooklyn will be available on port 8081 by default.
The process will be nohupped so you can exit the session (e.g. ssh on a remote machine).

You can override the A4C config by modifying `conf/alien4cloud-config.yml`
(and if you want to use a different alien4cloud config file, simply set
the `alien4cloud-config.file` property in your `brooklyn.properties`.

### Quickstart: With Alien4Cloud UI
## Launching the Alien4Cloud UI

To launch a standalone A4C instance, edit the config file in
`alien4cloud-standalone/` as desired then run:
Expand All @@ -33,14 +22,16 @@ To launch a standalone A4C instance, edit the config file in

Alien4Cloud will be running on port 8091, as set in that config.

To override the `brooklyn` launch to use an existing A4C installation,
set `client: false` and `hosts: <other-alien-es-backend-ip-port>`
in the `conf/alien4cloud-config.yml` used by this launch
(or specify a different `alien4cloud-config.file` for brooklyn).
For example if you want to run a local Brooklyn against a local but separate A4C,
use:
To configure the Apache Brooklyn with the TOSCA plugin to use this instance of the Alien4Cloud server,
the `alien4cloud-config.yml` it uses must be changed:

* set `client: false`
* set `hosts: <other-alien-es-backend-ip-port>`

nohup ./brooklyn.sh launch -Dalien4cloud-config.file=conf/alien4cloud-config.client-to-localhost.yml &
You can use a different config file but ensure the `system.properties` is updated to reflect that.
A restart of Apache Brooklyn (or at least the TOSCA bundle) is then required.

## Operations

Note that A4C launches ES with no credentials required,
so the ES instance should be secured at the network level
Expand All @@ -50,14 +41,6 @@ Any ElasticSearch data stored by this instance will use default ES file location
The recommended way to configure ES data is by launching a separate Alien4Cloud instance
configured as desired, with this instance pointing at that.

### Quickstart: TOSCA disabled

If you wish to start Brooklyn with TOSCA modules disabled then run:

nohup ./brooklyn.sh launch -Dbrooklyn.experimental.feature.tosca=false

You may also set `brooklyn.experimental.feature.tosca` in your `brooklyn.properties` file.


## Supported TOSCA Syntax

Expand Down
39 changes: 39 additions & 0 deletions karaf/init/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
brooklyn-tosca - karaf/init
===

[![Build Status](https://travis-ci.org/cloudsoft/brooklyn-tosca.svg?branch=master)](https://travis-ci.org/cloudsoft/brooklyn-tosca)

## Overview

This project builds a plugin to [Apache Brooklyn](http://brooklyn.io)
to understand [OASIS TOSCA](https://www.oasis-open.org/committees/tosca/) plans,
using [Alien4Cloud](http://alien4cloud.github.io).

It can be run as a standalone file, launching Brooklyn, or the JAR dropped in to your own Brooklyn.


## Build Notes

Consult the instructions in the root ancestor project for build instructions.


## Running

Once the project is built:

1. Install the `jar` bundle from the `target/` of this project to the Apache Brooklyn Karaf server

2. Add the [Alien4Cloud configuration file](../../brooklyn-tosca-dist/src/main/assembly/files/conf/alien4cloud-config.yml)
to the Apache Brooklyn Karaf `etc/` folder.

3. Add the following to the Apache Brooklyn Karaf `system.properties` file (also in `etc/`):

```
brooklyn.experimental.feature.tosca=true
alien4cloud-config.file=${karaf.etc}/alien4cloud-config.yml
```

4. Start (or restart) Apache Brooklyn. The Tosca code bundle initializes only when necessary, so visit the Brooklyn server in a browser to trigger ahead of time. Initialization may take a couple minutes.

That's it. You can now run TOSCA files from Apache Brooklyn!

0 comments on commit 109e9a5

Please sign in to comment.