Fix code block formatting
```yaml does not work on the website.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/46640cb8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/46640cb8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/46640cb8
Branch: refs/heads/master
Commit: 46640cb89531a342f26071f8f52f63164afe0ab1
Parents: d0376bd
Author: Sam Corbett
Authored: Thu May 19 16:13:18 2016 +0100
Committer: Sam Corbett
Committed: Thu May 19 16:13:18 2016 +0100
--
guide/ops/locations/_clouds.md | 2 -
guide/ops/locations/_more-clouds.md | 65 ++--
guide/yaml/test/test-entities.md| 17 -
guide/yaml/winrm/index.md | 7 ++--
4 files changed, 39 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46640cb8/guide/ops/locations/_clouds.md
--
diff --git a/guide/ops/locations/_clouds.md b/guide/ops/locations/_clouds.md
index ffde083..8d04599 100644
--- a/guide/ops/locations/_clouds.md
+++ b/guide/ops/locations/_clouds.md
@@ -241,8 +241,6 @@ If the method call cannot be matched to the template
options available - for exa
specific option but your location is an OpenStack cloud - then a warning is
logged and the option is ignored.
-
-
See the following resources for more information:
- [AWS VPC issues which may affect users with older AWS
accounts](vpc-issues.html)
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46640cb8/guide/ops/locations/_more-clouds.md
--
diff --git a/guide/ops/locations/_more-clouds.md
b/guide/ops/locations/_more-clouds.md
index acfd274..ee8b979 100644
--- a/guide/ops/locations/_more-clouds.md
+++ b/guide/ops/locations/_more-clouds.md
@@ -26,7 +26,6 @@ is included below. You may also find these sources helpful:
sometimes required for various clouds.
-
## Amazon Web Services (AWS)
### Credentials
@@ -172,6 +171,7 @@ For example, for dev/demo purposes an "everything" network
could be created that
|| Source IP Ranges|| 0.0.0.0/0 |
|| Allowed protocols and ports || tcp:0-65535 and udp:0-65535 |
+
## IBM SoftLayer
### VLAN Selection
@@ -185,15 +185,13 @@ The VLAN ID can be set explicitly using the fields
`primaryBackendNetworkComponentNetworkVlanId` of `SoftLayerTemplateOptions`
when specifying the location being used in the blueprint, as follows:
-```YAML
-location:
- jclouds:softlayer:
-region: ams01
-templateOptions:
- # Enter your preferred network IDs
- primaryNetworkComponentNetworkVlanId: 1153481
- primaryBackendNetworkComponentNetworkVlanId: 1153483
-```
+location:
+ jclouds:softlayer:
+region: ams01
+templateOptions:
+ # Enter your preferred network IDs
+ primaryNetworkComponentNetworkVlanId: 1153481
+ primaryBackendNetworkComponentNetworkVlanId: 1153483
This method requires that a VM already exist and you look up the IDs of its
VLANs, for example in the SoftLayer console UI, and that subsequently at least
@@ -210,16 +208,14 @@ end-users.
To use this method, we tell brooklyn to use
`SoftLayerSameVlanLocationCustomizer`
as a location customizer. This can be done on a location as follows:
-```YAML
-location:
- jclouds:softlayer:
-region: lon02
-customizers:
-- $brooklyn:object:
-type:
org.apache.brooklyn.location.jclouds.softlayer.SoftLayerSameVlanLocationCustomizer
-softlayer.vlan.scopeUid: "my-custom-scope"
-softlayer.vlan.timeout: 10m
-```
+location:
+ jclouds:softlayer:
+region: lon02
+customizers:
+- $brooklyn:object:
+type:
org.apache.brooklyn.location.jclouds.softlayer.SoftLayerSameVlanLocationCustomizer
+softlayer.vlan.scopeUid: "my-custom-scope"
+softlayer.vlan.timeout: 10m
Usually you will want the scope to be unique to a single application, but if
you
need multiple applications to share the same VLAN, simply configure them with
@@ -228,27 +224,24 @@ the same scope identifier.
It is also possible with many blueprints to specify this as one of the
`provisioning.properties` on an *application*:
-```YAML
-services:
-- type: org.apache.brooklyn.entity.stock.BasicApplication
- id: same-vlan-application
- brooklyn.config:
-provisioning.properties:
- customizers:
- - $brooklyn:object:
- type:
org.apache.brooklyn.location.jclouds.softlayer.SoftLayerSameVlanLocationCustomizer
-softlayer.vlan.scopeUid: "my-custom-scope"
-softlayer.vlan.timeout: 10m
-```
+