This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
The following commit(s) were added to refs/heads/master by this push:
new 28eeca8 tweak tour, update/remove broken external links
28eeca8 is described below
commit 28eeca8c6cacd2887446d46136b6dbc5507a379f
Author: Alex Heneveld <[email protected]>
AuthorDate: Mon Sep 6 01:06:09 2021 +0100
tweak tour, update/remove broken external links
---
guide/blueprints/ansible/creating-ansible-blueprints.md | 10 +++++-----
guide/blueprints/blueprinting-tips.md | 5 ++---
guide/blueprints/catalog/versioning.md | 3 +--
guide/blueprints/java/defining-and-deploying.md | 2 +-
guide/blueprints/salt/about-salt.md | 4 +---
guide/blueprints/salt/index.md | 4 ++--
guide/ops/troubleshooting/connectivity.md | 5 +++--
guide/start/_policies.camp.md | 5 ++---
style/css/_blueprint_tour.scss | 1 +
website/learnmore/blueprint-tour.md | 10 ++++------
website/learnmore/index.md | 9 +--------
11 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/guide/blueprints/ansible/creating-ansible-blueprints.md
b/guide/blueprints/ansible/creating-ansible-blueprints.md
index ef0d85c..e7319ab 100644
--- a/guide/blueprints/ansible/creating-ansible-blueprints.md
+++ b/guide/blueprints/ansible/creating-ansible-blueprints.md
@@ -69,8 +69,7 @@ service `service.name` is operating. By default Brooklyn
checks that the service
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).
+Ansible's `--extra-vars` mechanism.
For example, if the playbook in the example above contained configuration such
as:
- hosts: all
@@ -112,9 +111,10 @@ or REST API.)
### Roles and Multi-Playbook Installations
-There is no specific configuration in AnsibleEntity for Ansible
[Roles](http://docs.ansible.com/ansible/playbooks_roles.html),
- or to install multiple playbooks. However, the installation of roles or
multiple playbooks can be carried out first
- by taking advantage of Brooklyn's SameServerEntity. The installation step can
be applied in one child of the same server
+There is no specific configuration in AnsibleEntity for Ansible roles,
+ or to install multiple playbooks.
+However, the installation of roles or multiple playbooks can be carried out
first
+ by taking advantage of Brooklyn's `SameServerEntity`. The installation step
can be applied in one child of the same server
entity, while the AnsibleEntity can operate under the second child. It will
typically be necessary to delay the start
of the AnsibleEntity until the first child has carried out whatever
preparation is required. The examples below
illustrate the concept (with just one playbook, for brevity).
diff --git a/guide/blueprints/blueprinting-tips.md
b/guide/blueprints/blueprinting-tips.md
index 86d7634..dfcc4e4 100644
--- a/guide/blueprints/blueprinting-tips.md
+++ b/guide/blueprints/blueprinting-tips.md
@@ -58,10 +58,9 @@ This is fast and simple, but has some obvious downsides:
* Some entities require `sudo` rights, which must be granted to the user
running Brooklyn.
-#### Deploying to Clocker
+#### Deploying to Containers
-Docker containers provide a convenient way to test blueprints (and also to run
blueprints in
-production!).
+Containers can give a fast, convenient way to test blueprints, to run apps, or
to failover temporarily.
#### Local Repository of Install Artifacts
diff --git a/guide/blueprints/catalog/versioning.md
b/guide/blueprints/catalog/versioning.md
index 185caf5..b643ceb 100644
--- a/guide/blueprints/catalog/versioning.md
+++ b/guide/blueprints/catalog/versioning.md
@@ -39,8 +39,7 @@ where the `<major>`, `<minor>`, and `<patch>` parts are
numbers
in accordance with [semver](http://semver.org) semantic versioning,
assumed to be `0` if omitted,
and an `<qualifier>` is made up of letters, numbers, `"-"` and `"_"`
-in accordance with [OSGi](https://www.osgi.org/release-4-version-4-3-download/)
-(see sections 1.3.2 and 3.2.5).
+in accordance with OSGi version requirements.
Examples:
diff --git a/guide/blueprints/java/defining-and-deploying.md
b/guide/blueprints/java/defining-and-deploying.md
index 2f8ffcc..2458f4f 100644
--- a/guide/blueprints/java/defining-and-deploying.md
+++ b/guide/blueprints/java/defining-and-deploying.md
@@ -129,7 +129,7 @@ for how to store these credentials more securely.
## Building the OSGi Bundle
-Next we will build this example as an [OSGi
Bundle](https://www.osgi.org/developer/architecture/)
+Next we will build this example as an [OSGi bundle](https://docs.osgi.org/)
so that it can be added to the Apache Brooklyn server at runtime, and so
multiple versions of the
blueprint can be managed.
diff --git a/guide/blueprints/salt/about-salt.md
b/guide/blueprints/salt/about-salt.md
index 78f4d47..990b1fc 100644
--- a/guide/blueprints/salt/about-salt.md
+++ b/guide/blueprints/salt/about-salt.md
@@ -27,9 +27,7 @@ Salt comes with built-in support for many software systems,
and has a repository
Brooklyn provides a Salt entity type. An entity of this type can be specified
in a blueprint in order to provision the
node through Salt. The Salt entity will download Salt and install it on the
node. The entity type supports the
configuration of Salt formulas and Pillar data to download, and the
configuration of what Salt states to apply.
-These are managed using Salt in 'masterless' mode, as described on the
-[Saltstack
site](https://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html#salt-masterless-quickstart),
-using the 'salt-call' functionality of Salt.
+These are managed using Salt in 'masterless' mode using the 'salt-call'
functionality of Salt.
The Salt 'highstate' (the collection of states applied to the system) is
exposed as a sensor on the entity. An effector
is provided on the entity that supports general purpose Salt instructions.
diff --git a/guide/blueprints/salt/index.md b/guide/blueprints/salt/index.md
index b6aad5f..5efeb23 100644
--- a/guide/blueprints/salt/index.md
+++ b/guide/blueprints/salt/index.md
@@ -6,8 +6,8 @@ children:
- creating-salt-blueprints.md
---
-This guide describes how Brooklyn entities can be created using the Salt
infrastructure management tool
- ([saltstack.com](https://saltstack.com/)).
+This guide describes how Brooklyn entities can be created using the
+[Salt](https://docs.saltproject.io/) infrastructure management tool.
At present Brooklyn provides basic support for Salt, operating in a
'masterless' mode.
Comments on this support and suggestions for further development are welcome.
diff --git a/guide/ops/troubleshooting/connectivity.md
b/guide/ops/troubleshooting/connectivity.md
index 98ea2bb..5c218bc 100644
--- a/guide/ops/troubleshooting/connectivity.md
+++ b/guide/ops/troubleshooting/connectivity.md
@@ -49,7 +49,8 @@ The following commands can be useful:
* `traceroute` prints the route that packets take to a network host. e.g.
`traceroute www.google.com`.
## Proxy settings
-Depending on the type of location, brooklyn might use HTTP to provision
machines (clocker, jclouds). If the host environment defines proxy settings,
these might interfere with the reachability of the respective HTTP service.
+Depending on the type of location, Apache Brooklyn might require HTTP to
provision machines or services.
+If the host environment defines proxy settings, these might interfere with the
reachability of the respective HTTP service.
One such case is using VirtualBox with host-only or private internal network
settings, while using an external proxy for accessing the internet. It is clear
that the external proxy won't be able to route HTTP calls properly, but that
might not be clear when reading the logs (although brooklyn will present the
failing URL).
@@ -60,7 +61,7 @@ Try accessing the web-service URLs from a browser via the
proxy, or perhaps try
bin/brooklyn launch
~~~
-If a system-level proxy server has been configured, you can instruct brooklyn
to use the proxy server by passing `-Djava.net.useSystemProxies=true` to the JVM
+If a system-level proxy server has been configured, you can instruct Apache
Brooklyn to use the proxy server by passing `-Djava.net.useSystemProxies=true`
to the JVM.
## Service is listening
diff --git a/guide/start/_policies.camp.md b/guide/start/_policies.camp.md
index 3deabd4..37e9d75 100644
--- a/guide/start/_policies.camp.md
+++ b/guide/start/_policies.camp.md
@@ -104,9 +104,8 @@ version: 0.1.0-SNAPSHOT
</div>
<div class="long"><p>
Blueprints are designed for portability.
- Pick from dozens of clouds in hundreds of datacenters.
- Or machines with fixed IP addresses, localhost,
- Docker on <a href="http://clocker.io";>Clocker</a>, etc.
+ Pick from Amazon or Azure or any of dozens of clouds.
+ Or containers, VMware, physical servers, etc.
</p><p>
Here we target pre-existing Vagrant VMs.
</p></div>
diff --git a/style/css/_blueprint_tour.scss b/style/css/_blueprint_tour.scss
index 5fe50fe..df20f8a 100644
--- a/style/css/_blueprint_tour.scss
+++ b/style/css/_blueprint_tour.scss
@@ -57,6 +57,7 @@ div.annotated_blueprint {
position: absolute;
@include transform('translateX(-100%) translateY(-50%)');
width: $annotation_width;
+ max-width: 28em;
@include flex();
-webkit-align-items: center;
diff --git a/website/learnmore/blueprint-tour.md
b/website/learnmore/blueprint-tour.md
index c0dcc98..b9324d3 100644
--- a/website/learnmore/blueprint-tour.md
+++ b/website/learnmore/blueprint-tour.md
@@ -19,12 +19,11 @@ title_in_menu: Blueprint Tour
<div class="short">
Describe your application
</div>
- <div class="long"><p>
+ <div class="long"><p markdown="1">
Start by giving it a name,
optionally adding a version and other metadata.
The format is YAML -- a human-friendly extension to JSON --
- following the
- <a href="/website/learnmore/theory.html#standards">CAMP</a>
standard.
+ following the [CAMP](/website/learnmore/theory.html#standards)
standard.
</p><p>
Treat it like source code: use comments, version control it, test
it with CI.
</p></div>
@@ -147,9 +146,8 @@ services:</div></div>
</div>
<div class="long"><p>
Blueprints are designed for portability.
- Pick from dozens of clouds in hundreds of datacenters.
- Or machines with fixed IP addresses, localhost,
- Docker on <a href="http://clocker.io";>Clocker</a>, etc.
+ Pick from Amazon or Azure or any of dozens of clouds.
+ Or containers, VMware, physical servers, etc.
</p><p>
And you're not limited to servers:
services, PaaS, even networks can be locations.
diff --git a/website/learnmore/index.md b/website/learnmore/index.md
index 42dfa69..5422846 100644
--- a/website/learnmore/index.md
+++ b/website/learnmore/index.md
@@ -17,14 +17,7 @@ Got two minutes? watch the video
Four minutes? read the features list
cf
http://help.eclipse.org/juno/index.jsp?topic=%2Forg.eclipse.platform.doc.user%2FwhatsNew%2Fplatform_whatsnew.html
-- though maybe with smaller screenshots at left and bigger text for summary!)
More time?
- Browse the catalog of Supported software, clouds, and policies
- Read on the Theory behing brooklyn
- Read the Brooklyn News
- infoq - http://www.infoq.com/news/2014/06/clocker
- Adam Davis: The case for application-driven cloud computing (Gluecon
keynote)
http://www.cloudsoftcorp.com/blog/2014/06/adam-davis-case-application-driven-cloud-computing/
- [showing video at min 14]
- twitter feed
- selected blog posts
+ ...
-->
{% include list-children.html %}
