You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/24 19:55:13 UTC
[1/5] brooklyn-docs git commit: Initial Ansible documents.
Repository: brooklyn-docs
Updated Branches:
refs/heads/master ee148da6a -> 628ee3203
Initial Ansible documents.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/878695ce
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/878695ce
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/878695ce
Branch: refs/heads/master
Commit: 878695ceb4c4c83835bfdb38ed88f941487b9596
Parents: fce745e
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Thu Feb 11 12:06:53 2016 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Feb 11 12:06:53 2016 +0000
----------------------------------------------------------------------
guide/yaml/ansible/about-ansible.md | 34 ++++++
.../yaml/ansible/creating-ansible-blueprints.md | 111 +++++++++++++++++++
guide/yaml/ansible/index.md | 16 +++
guide/yaml/index.md | 1 +
guide/yaml/salt/creating-salt-blueprints.md | 4 +-
5 files changed, 164 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/878695ce/guide/yaml/ansible/about-ansible.md
----------------------------------------------------------------------
diff --git a/guide/yaml/ansible/about-ansible.md b/guide/yaml/ansible/about-ansible.md
new file mode 100644
index 0000000..9886993
--- /dev/null
+++ b/guide/yaml/ansible/about-ansible.md
@@ -0,0 +1,34 @@
+---
+title: About Ansible
+title_in_menu: About Ansible
+layout: website-normal
+---
+
+## What you need to know about Ansible
+
+[Ansible](http://docs.ansible.com/ansible/) is a deployment tool designed to work in an agent-less manner, normally
+performing its operations on a node over SSH from some central administrating node. Brooklyn can deploy software
+via Ansible on one of its managed nodes, by first installing Ansible on the node itself and then using Ansible to deploy
+the required software.
+
+A 'Playbook' in Ansible is a specification of the configuration and deployment of a system.
+Playbooks are expressed in YAML format, and contain a number of 'plays', which are in turn lists of tasks to carry out
+to achieve the desired configuration on the system. 'Roles' are pre-written modular collections of tasks, and can
+be included in playbooks.
+
+Ansible comes with built-in support for many software systems, and has a community repository of roles exists at
+[https://galaxy.ansible.com](https://galaxy.ansible.com).
+
+
+### How Brooklyn interacts with Ansible
+
+Brooklyn provides a Ansible entity type. An entity of this type can be specified in a blueprint in order to provision the
+node through Ansible. The Ansible entity will download Ansible and install it on the node. The entity type supports the
+configuration of Ansible playbooks to download, or write inline in the blueprint, for simple playbooks.
+Configuration values for the playbooks can be supplied in the blueprint.
+
+Brooklyn will deploy the software specified in the playbook when the entity starts. In addition, an effector is
+provided on the entity that supports general purpose Ansible instructions.
+
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/878695ce/guide/yaml/ansible/creating-ansible-blueprints.md
----------------------------------------------------------------------
diff --git a/guide/yaml/ansible/creating-ansible-blueprints.md b/guide/yaml/ansible/creating-ansible-blueprints.md
new file mode 100644
index 0000000..ddc6b61
--- /dev/null
+++ b/guide/yaml/ansible/creating-ansible-blueprints.md
@@ -0,0 +1,111 @@
+---
+title: Creating Blueprints with Ansible
+title_in_menu: Creating Blueprints with Ansible
+layout: website-normal
+---
+
+To write a blueprint to use Ansible with Brooklyn it will help to have a degree of familiarity with Ansible itself. In the
+sections below, when the Brooklyn configuration is described, the underlying Ansible operation is also noted briefly, for
+clarity for readers who know Ansible.
+
+To manage a node with Ansible, create a blueprint containing a service of type `org.apache.brooklyn.entity.cm.ansible.AnsibleEntity`
+and define and minimum the `playbook` value, and one or other of `playbook.url` or `playbook.yaml`. You must also define
+the `service.name` that will be tested in order to determine if the entity is running successfully.
+
+For example:
+
+ name: myweb
+ location: ...
+ services:
+ - type: org.apache.brooklyn.entity.cm.ansible.AnsibleEntity
+ id: apache
+ name: apache
+ service.name: apache2
+ playbook: apache-playbook
+ playbook.url: http://myhost/projectX/apache-playbook.yaml
+
+
+This example specifies that Brooklyn should use Ansible to download the playbook from the repository on
+"myhost". The playbook contains the instructions to install the Apache web server. To start the
+entity, Brooklyn will use Ansible's "ansible-playbook" command to run the playbook, which will bring up the web server.
+
+
+### Lifecycle of AnsibleEntity
+
+The start effector applies the playbook and verifies that it has started the software correctly by checking the service
+defined as `service.name` is running. This can be customized, see `ansible.service.start` configuration below.
+
+The stop effector will stop the service `service.name`. Again, this can be customized, with `ansible.service.stop`.
+
+The restart effector will apply stop and then start.
+
+
+### Configuration of AnsibleEntity
+
+The `playbook` configuration key names the top level list of states that will be applied using Ansible.
+ This configuration key is mandatory.
+
+The playbook must be defined using one or other (both together are not permitted) of `playbook.yaml` or `playbook.url`.
+The former allows the playbook content to be defined inline within the blueprint, using the normal YAML format of an
+Ansible playbook. The latter obtains the playbook from an external URL.
+
+The `ansible.service.start` configuration key allows the blueprint author to override the command used by default to
+verify that the service `service.name` is running (or to start it, if the playbook did not specify it should run by
+default). The default value is:
+
+ sudo ansible localhost -c local -m service -a "name=<service.name> state=started"
+
+Similarly the `ansible.service.stop` configuration key permits override of the instruction used to get Ansible to stop the
+service, by default
+
+ sudo ansible localhost -c local -m service -a "name=<service.name> state=stopped"
+
+The `ansible.service.checkPort` configuration key allows the user to override the mechanism used to check that the
+service `service.name` is operating. By default Brooklyn checks that the service process is running. However, if the
+ service is one that listens on a particular port, this configuration key allows the blueprint author to instruct
+ Brooklyn to check that the port is being listened on, using the Ansible `wait_for` module. The value of the key is
+ the port number to check.
+
+The `ansible.vars` configuration key allows the blueprint author to provide entity-specific values for configuration
+variables used in the playbook, so that one playbook can be used by multiple entities, each customized appropriately.
+The value of `ansible.vars` is an arbitrary block of YAML configuration that will be applied to the playbook using
+Ansible's `--extra-vars` mechanism, as described in the
+Ansible [documentation](http://docs.ansible.com/ansible/playbooks_variables.html#passing-variables-on-the-command-line).
+For example, if the playbook in the example above contained configuration such as:
+
+ - hosts: all
+ vars:
+ http_port: 80
+ max_clients: 200
+ remote_user: root
+ tasks:
+ ...
+
+ then to change the port that the webserver in the example above runs on, it would be possible to define the following
+ in the blueprint:
+
+ name: myweb
+ location: ...
+ services:
+ - type: org.apache.brooklyn.entity.cm.ansible.AnsibleEntity
+ id: apache
+ name: apache
+ service.name: apache2
+ playbook: apache-playbook
+ playbook.url: http://myhost/projectX/apache-playbook.yaml
+ ansible.vars:
+ http_port: 8080
+
+
+### ansibleCall Effector
+
+The Ansible entity includes a general purpose Ansible effector, `ansibleCommand`, which permits execution of Ansible
+commands via `ansible`. It contains a two parameters:
+1. `module` specifies the Ansible module to invoke. The default is "command".
+2. `args` specifies the argument data for the Ansible module. For example, to download an additional file for the
+webserver, the command could be invoked with the following arguments. (For convenience this
+example uses the client CLI, "br", but the effector could be invoked by any applicable means, e.g. via the web UI
+or REST API.)
+
+ $ br app myweb ent apache effector ansibleCommand invoke \
+ -P module=shell -P args='curl http://myhost:8080/additional.html > /var/www/html/additional.html'
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/878695ce/guide/yaml/ansible/index.md
----------------------------------------------------------------------
diff --git a/guide/yaml/ansible/index.md b/guide/yaml/ansible/index.md
new file mode 100644
index 0000000..1cda04e
--- /dev/null
+++ b/guide/yaml/ansible/index.md
@@ -0,0 +1,16 @@
+---
+title: Ansible in YAML Blueprints
+layout: website-normal
+children:
+- about-ansible.md
+- creating-ansible-blueprints.md
+---
+
+This guide describes how Brooklyn entities can be created using the Ansible infrastructure management tool
+ ([ansiblestack.com](ansiblestack.com)).
+At present Brooklyn provides basic support for Ansible, operating in a 'masterless' mode.
+Comments on this support and suggestions for further development are welcome.
+
+This guide assumes you are familiar with the basics of [creating YAML blueprints](../).
+
+{% include list-children.html %}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/878695ce/guide/yaml/index.md
----------------------------------------------------------------------
diff --git a/guide/yaml/index.md b/guide/yaml/index.md
index 5651bef..43d3b25 100644
--- a/guide/yaml/index.md
+++ b/guide/yaml/index.md
@@ -11,6 +11,7 @@ children:
- blueprinting-tips.md
- custom-entities.md
- winrm/
+- ansible/
- chef/
- salt/
- test/
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/878695ce/guide/yaml/salt/creating-salt-blueprints.md
----------------------------------------------------------------------
diff --git a/guide/yaml/salt/creating-salt-blueprints.md b/guide/yaml/salt/creating-salt-blueprints.md
index d73ce1d..f00d687 100644
--- a/guide/yaml/salt/creating-salt-blueprints.md
+++ b/guide/yaml/salt/creating-salt-blueprints.md
@@ -8,8 +8,8 @@ To write a blueprint to use Salt with Brooklyn it will help to have a degree of
sections below, when the Brooklyn configuration is described, the underlying Salt operation is also noted briefly, for
clarity for readers who know Salt.
-To manage a node with Salt, create a blueprint containing a service of type `org.apache.brooklyn.cm.salt.SaltEntity`
-and define and minimum the `formulas` and `start_states`
+To manage a node with Salt, create a blueprint containing a service of type `org.apache.brooklyn.entity.cm.salt.SaltEntity`
+and define the `formulas` and `start_states`
For example:
name: Salt Example setting up Apache httpd
[4/5] brooklyn-docs git commit: This closes #14
Posted by he...@apache.org.
This closes #14
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/058dfdda
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/058dfdda
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/058dfdda
Branch: refs/heads/master
Commit: 058dfddaed9ca89725c5638b338ce867da22737a
Parents: a708741 e600c56
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Feb 24 10:51:24 2016 -0800
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Feb 24 10:51:24 2016 -0800
----------------------------------------------------------------------
Gemfile | 2 +-
guide/dev/env/maven-build.md | 8 ++++----
guide/misc/download.md | 8 ++++----
.../committers/release-process/prerequisites.md | 12 ++++++------
.../committers/release-process/publish-temp.md | 4 ++--
.../developers/committers/release-process/publish.md | 8 ++++----
website/developers/committers/release-process/vote.md | 10 +++++-----
7 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[2/5] brooklyn-docs git commit: First pass at fixes for broken links
due to incubator change.
Posted by he...@apache.org.
First pass at fixes for broken links due to incubator change.
See https://issues.apache.org/jira/browse/BROOKLYN-224.
Note there are still some references to "incubator" around voting processes that I was unsure about changing, e.g. references to general@incubator.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e600c56d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e600c56d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e600c56d
Branch: refs/heads/master
Commit: e600c56d284d234ddc35b766ed952bfa959f83e8
Parents: fce745e
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Feb 15 10:19:57 2016 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Feb 15 10:19:57 2016 +0000
----------------------------------------------------------------------
Gemfile | 2 +-
guide/dev/env/maven-build.md | 8 ++++----
guide/misc/download.md | 8 ++++----
.../committers/release-process/prerequisites.md | 12 ++++++------
.../committers/release-process/publish-temp.md | 4 ++--
.../developers/committers/release-process/publish.md | 8 ++++----
website/developers/committers/release-process/vote.md | 10 +++++-----
7 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index 11d388b..c7683ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
#ruby=ruby-2.1.2
-#ruby-gemset=incubator-brooklyn-site
+#ruby-gemset=brooklyn-site
source 'https://rubygems.org'
ruby '2.1.2'
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/guide/dev/env/maven-build.md
----------------------------------------------------------------------
diff --git a/guide/dev/env/maven-build.md b/guide/dev/env/maven-build.md
index 50534e9..8489658 100644
--- a/guide/dev/env/maven-build.md
+++ b/guide/dev/env/maven-build.md
@@ -105,20 +105,20 @@ although we'd love to if anyone can help!):
[INFO] — maven-assembly-plugin:2.3:single (build-distribution-dir) @ brooklyn-dist —
[INFO] Reading assembly descriptor: src/main/config/build-distribution-dir.xml
{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory.
-[INFO] Copying files to ~/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-dist
-[WARNING] Assembly file: ~/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-dist is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment.
+[INFO] Copying files to ~/repos/apache/brooklyn/usage/dist/target/brooklyn-dist
+[WARNING] Assembly file: ~/repos/apache/brooklyn/usage/dist/target/brooklyn-dist is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment.
...
[INFO] — maven-assembly-plugin:2.3:single (build-distribution-archive) @ brooklyn-dist —
[INFO] Reading assembly descriptor: src/main/config/build-distribution-archive.xml
{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory.
-{% comment %}BROOKLYN_VERSION{% endcomment %}[INFO] Building tar: /Users/aled/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-0.9.0-SNAPSHOT-dist.tar.gz
+{% comment %}BROOKLYN_VERSION{% endcomment %}[INFO] Building tar: /Users/aled/repos/apache/brooklyn/usage/dist/target/brooklyn-0.9.0-SNAPSHOT-dist.tar.gz
{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory.
...
-[WARNING] Don't override file /Users/aled/repos/apache/incubator-brooklyn/usage/archetypes/quickstart/target/test-classes/projects/integration-test-1/project/brooklyn-sample/src/main/resources/sample-icon.png
+[WARNING] Don't override file /Users/aled/repos/apache/brooklyn/usage/archetypes/quickstart/target/test-classes/projects/integration-test-1/project/brooklyn-sample/src/main/resources/sample-icon.png
...
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/guide/misc/download.md
----------------------------------------------------------------------
diff --git a/guide/misc/download.md b/guide/misc/download.md
index 6005a6d..c6d6de1 100644
--- a/guide/misc/download.md
+++ b/guide/misc/download.md
@@ -159,16 +159,16 @@ You can download archives of the source directly:
<tr>
<td style="vertical-align: middle;"><center>{{ site.brooklyn.git_branch }}</center></td>
<td>
-<a href="https://github.com/apache/incubator-brooklyn/tarball/{{ site.brooklyn.git_branch }}"><img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
-<a href="https://github.com/apache/incubator-brooklyn/zipball/{{ site.brooklyn.git_branch }}"><img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
+<a href="https://github.com/apache/brooklyn/tarball/{{ site.brooklyn.git_branch }}"><img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
+<a href="https://github.com/apache/brooklyn/zipball/{{ site.brooklyn.git_branch }}"><img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
</td>
</tr>
{% if site.brooklyn.git_branch != 'master' %}
<tr>
<td style="vertical-align: middle;"><center>master</center></td>
<td>
-<a href="https://github.com/apache/incubator-brooklyn/tarball/master"><img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
-<a href="https://github.com/apache/incubator-brooklyn/zipball/master"><img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
+<a href="https://github.com/apache/brooklyn/tarball/master"><img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
+<a href="https://github.com/apache/brooklyn/zipball/master"><img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
</td>
</tr>
{% endif %}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/prerequisites.md b/website/developers/committers/release-process/prerequisites.md
index 9977201..e1aa2c9 100644
--- a/website/developers/committers/release-process/prerequisites.md
+++ b/website/developers/committers/release-process/prerequisites.md
@@ -11,18 +11,18 @@ Apache releases are posted to dist.apache.org, which is a Subversion repository.
We have two directories here:
-- https://dist.apache.org/repos/dist/release/incubator/brooklyn - this is where IPMC approved releases go. Do not upload
- here until we have a vote passed on dev@brooklyn and incubator-general. Check out this folder and name it
+- https://dist.apache.org/repos/dist/release/brooklyn - this is where IPMC approved releases go. Do not upload
+ here until we have a vote passed on dev@brooklyn. Check out this folder and name it
`apache-dist-release-brooklyn`
-- https://dist.apache.org/repos/dist/dev/incubator/brooklyn - this is where releases to be voted on go. Make the release
+- https://dist.apache.org/repos/dist/dev/brooklyn - this is where releases to be voted on go. Make the release
artifact, and post it here, then post the [VOTE] thread with links here. Check out this folder and name it
`apache-dist-dev-brooklyn`.
Example:
{% highlight bash %}
-svn co https://dist.apache.org/repos/dist/release/incubator/brooklyn apache-dist-release-brooklyn
-svn co https://dist.apache.org/repos/dist/dev/incubator/brooklyn apache-dist-dev-brooklyn
+svn co https://dist.apache.org/repos/dist/release/brooklyn apache-dist-release-brooklyn
+svn co https://dist.apache.org/repos/dist/dev/brooklyn apache-dist-dev-brooklyn
{% endhighlight %}
When working with these folders, **make sure you are working with the correct one**, otherwise you may be publishing
@@ -76,7 +76,7 @@ Now add your key to the `apache-dist-release-brooklyn/KEYS` file:
{% highlight bash %}
cd apache-dist-release-brooklyn
(gpg2 --list-sigs richard@apache.org && gpg2 --armor --export richard@apache.org) >> KEYS
-svn --username $SVN_USERNAME commit -m 'Update incubator/brooklyn/KEYS for $GPG_KEY'
+svn --username $SVN_USERNAME commit -m 'Update brooklyn/KEYS for $GPG_KEY'
{% endhighlight %}
References:
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/website/developers/committers/release-process/publish-temp.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/publish-temp.md b/website/developers/committers/release-process/publish-temp.md
index 9727c52..64814e8 100644
--- a/website/developers/committers/release-process/publish-temp.md
+++ b/website/developers/committers/release-process/publish-temp.md
@@ -8,7 +8,7 @@ Publish the source and binary distributions to the pre-release area
-------------------------------------------------------------------
You will need to have checked out the Apache distribution Subversion repository located at
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn. Please refer to [Prerequisites](prerequisites.html) for
+https://dist.apache.org/repos/dist/dev/brooklyn. Please refer to [Prerequisites](prerequisites.html) for
information.
In your workspace for the `dist.apache.org` repo, create a directory with the artifact name and version:
@@ -22,7 +22,7 @@ associated `.md5`, `.sha1`, `.sha256` and `.asc` signatures. Then commit:
{% highlight bash %}
svn add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-svn commit --message "Add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} to dist/dev/incubator/brooklyn"
+svn commit --message "Add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} to dist/dev/brooklyn"
{% endhighlight %}
These steps can be performed as part of the `make-release-artifacts.sh` script used earlier
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/website/developers/committers/release-process/publish.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/publish.md b/website/developers/committers/release-process/publish.md
index 6b3e1b0..e23bdaf 100644
--- a/website/developers/committers/release-process/publish.md
+++ b/website/developers/committers/release-process/publish.md
@@ -8,7 +8,7 @@ Publish the source and binary distributions to the pre-release area
-------------------------------------------------------------------
You will need to have checked out the Apache distribution Subversion repository located at
-https://dist.apache.org/repos/dist/release/incubator/brooklyn. Please refer to [Prerequisites](prerequisites.html) for
+https://dist.apache.org/repos/dist/release/brooklyn. Please refer to [Prerequisites](prerequisites.html) for
information.
In your workspace for the `dist.apache.org` repo, create a directory with the artifact name and version:
@@ -58,7 +58,7 @@ Then, add them to Subversion and commit.
{% highlight bash %}
svn add apache-brooklyn-${VERSION_NAME}
-svn commit --message "Add apache-brooklyn-${VERSION_NAME} to dist/release/incubator/brooklyn"
+svn commit --message "Add apache-brooklyn-${VERSION_NAME} to dist/release/brooklyn"
{% endhighlight %}
@@ -97,7 +97,7 @@ mvn clean install -DskipTests
Ensure the SVN repo is up-to-date (very painful otherwise!)
{% highlight bash %}
-cd ${BROOKLYN_SITE_DIR-../incubator-brooklyn-site-public}
+cd ${BROOKLYN_SITE_DIR-../brooklyn-site-public}
svn up
cd -
{% endhighlight %}
@@ -120,7 +120,7 @@ Update the "latest" docs to this release:
Now publish _site/v/latest to the public website:
{% highlight bash %}
-cd ${BROOKLYN_SITE_DIR-../../incubator-brooklyn-site-public}
+cd ${BROOKLYN_SITE_DIR-../../brooklyn-site-public}
svn add * --force
export DELETIONS=$( svn status | sed -e '/^!/!d' -e 's/^!//' )
if [ ! -z "${DELETIONS}" ] ; then svn rm ${DELETIONS} ; fi
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e600c56d/website/developers/committers/release-process/vote.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/vote.md b/website/developers/committers/release-process/vote.md
index e459bdd..d3b466b 100644
--- a/website/developers/committers/release-process/vote.md
+++ b/website/developers/committers/release-process/vote.md
@@ -12,7 +12,7 @@ taking a single argument being the staging repo link. For example:
brooklyn-dist/release/print-vote-email.sh orgapachebrooklyn-1234 | pbcopy
-You should move the subject and put your name at the end, and simply eyeball the rest. This should be sent to **dev@brooklyn.incubator.apache.org**.
+You should move the subject and put your name at the end, and simply eyeball the rest. This should be sent to **dev@brooklyn.apache.org**.
Alternatively, copy-paste the e-mail template below, being sure to substitute:
@@ -33,7 +33,7 @@ binary distribution, and Maven artifacts.
The source and binary distributions, including signatures, digests, etc. can
be found at:
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
+https://dist.apache.org/repos/dist/dev/brooklyn/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
The artifact SHA-256 checksums are as follows:
c3b5c581f14b44aed786010ac7c8c2d899ea0ff511135330395a2ff2a30dd5cf *apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}-bin.tar.gz
@@ -48,11 +48,11 @@ All release artifacts are signed with the following key:
https://people.apache.org/keys/committer/richard.asc
KEYS file available here:
-https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
+https://dist.apache.org/repos/dist/release/brooklyn/KEYS
The artifacts were built from Git commit ID
24a23c5a4fd5967725930b8ceaed61dfbd225980
-https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=24a23c5a4fd5967725930b8ceaed61dfbd225980
+https://git-wip-us.apache.org/repos/asf?p=brooklyn.git;a=commit;h=24a23c5a4fd5967725930b8ceaed61dfbd225980
Please vote on releasing this package as Apache Brooklyn ${VERSION_NAME}.
@@ -117,7 +117,7 @@ Note that you must find the URL for the previous thread at [mail-archives.apache
The vote for releasing Apache Brooklyn ${VERSION_NAME} passed with 5 binding +1s, 1 non-binding +1s, and no 0 or -1.
Vote thread link:
-https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi1WapCMRUqQ93E7Qow5onKgL3nyG3HW9Cse7vo%2BtUChRQ%40mail.gmail.com%3E
+https://mail-archives.apache.org/mod_mbox/brooklyn-dev/201507.mbox/%3CCABQFKi1WapCMRUqQ93E7Qow5onKgL3nyG3HW9Cse7vo%2BtUChRQ%40mail.gmail.com%3E
Binding +1s:
Hadrian Zbarcea (IPMC)
[3/5] brooklyn-docs git commit: This closes #13
Posted by he...@apache.org.
This closes #13
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/a7087411
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/a7087411
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/a7087411
Branch: refs/heads/master
Commit: a70874113a5f0034aad2fe75df3db0494955027a
Parents: ee148da 878695c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Feb 24 10:46:59 2016 -0800
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Feb 24 10:46:59 2016 -0800
----------------------------------------------------------------------
guide/yaml/ansible/about-ansible.md | 34 ++++++
.../yaml/ansible/creating-ansible-blueprints.md | 111 +++++++++++++++++++
guide/yaml/ansible/index.md | 16 +++
guide/yaml/index.md | 1 +
guide/yaml/salt/creating-salt-blueprints.md | 4 +-
5 files changed, 164 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[5/5] brooklyn-docs git commit: minor cleanups following #14,
removing incomplete source download instructions
Posted by he...@apache.org.
minor cleanups following #14, removing incomplete source download instructions
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/628ee320
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/628ee320
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/628ee320
Branch: refs/heads/master
Commit: 628ee3203b8d05b8c8898481169e158b966ff708
Parents: 058dfdd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Feb 24 10:54:52 2016 -0800
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Feb 24 10:54:52 2016 -0800
----------------------------------------------------------------------
guide/misc/download.md | 24 +++-----------------
.../committers/release-process/prerequisites.md | 2 +-
2 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/628ee320/guide/misc/download.md
----------------------------------------------------------------------
diff --git a/guide/misc/download.md b/guide/misc/download.md
index c6d6de1..d154802 100644
--- a/guide/misc/download.md
+++ b/guide/misc/download.md
@@ -151,25 +151,7 @@ you must either have Brooklyn built locally or one of these snapshot repositorie
Source code is hosted at [github.com/apache/brooklyn](http://github.com/apache/brooklyn),
with this version in branch [{{ site.brooklyn.git_branch }}]({{ site.brooklyn.url.git }}).
-Information on working with the source is [here]({{ site.path.guide }}/dev/code).
+These locations have a `README.md` in the root which explains how to get the code including
+submodules.
-You can download archives of the source directly:
-
-<table class="table">
- <tr>
- <td style="vertical-align: middle;"><center>{{ site.brooklyn.git_branch }}</center></td>
- <td>
-<a href="https://github.com/apache/brooklyn/tarball/{{ site.brooklyn.git_branch }}"><img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
-<a href="https://github.com/apache/brooklyn/zipball/{{ site.brooklyn.git_branch }}"><img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
- </td>
- </tr>
-{% if site.brooklyn.git_branch != 'master' %}
- <tr>
- <td style="vertical-align: middle;"><center>master</center></td>
- <td>
-<a href="https://github.com/apache/brooklyn/tarball/master"><img border="0" width="90" src="https://github.com/images/modules/download/tar.png"></a>
-<a href="https://github.com/apache/brooklyn/zipball/master"><img border="0" width="90" src="https://github.com/images/modules/download/zip.png"></a>
- </td>
- </tr>
-{% endif %}
-</table>
\ No newline at end of file
+Useful information on working with the source is [here]({{ site.path.guide }}/dev/code).
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/628ee320/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/prerequisites.md b/website/developers/committers/release-process/prerequisites.md
index e1aa2c9..d6afc75 100644
--- a/website/developers/committers/release-process/prerequisites.md
+++ b/website/developers/committers/release-process/prerequisites.md
@@ -11,7 +11,7 @@ Apache releases are posted to dist.apache.org, which is a Subversion repository.
We have two directories here:
-- https://dist.apache.org/repos/dist/release/brooklyn - this is where IPMC approved releases go. Do not upload
+- https://dist.apache.org/repos/dist/release/brooklyn - this is where PMC approved releases go. Do not upload
here until we have a vote passed on dev@brooklyn. Check out this folder and name it
`apache-dist-release-brooklyn`
- https://dist.apache.org/repos/dist/dev/brooklyn - this is where releases to be voted on go. Make the release