More clouds no longer relevant

Also fixed some formatting issues in openstack section


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2e792839
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2e792839
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2e792839

Branch: refs/heads/master
Commit: 2e792839c510d17cc9bcff760d02a2ba08a68f1c
Parents: 7d7c8f7
Author: Duncan Grant <[email protected]>
Authored: Mon Jul 4 16:44:31 2016 +0100
Committer: Duncan Grant <[email protected]>
Committed: Mon Jul 4 16:44:31 2016 +0100

----------------------------------------------------------------------
 guide/ops/locations/_clouds.md      |  13 ++-
 guide/ops/locations/_more-clouds.md |  28 -------
 guide/ops/locations/_openstack.md   | 132 +++++++++++++++----------------
 3 files changed, 75 insertions(+), 98 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2e792839/guide/ops/locations/_clouds.md
----------------------------------------------------------------------
diff --git a/guide/ops/locations/_clouds.md b/guide/ops/locations/_clouds.md
index 24b92d0..5082776 100644
--- a/guide/ops/locations/_clouds.md
+++ b/guide/ops/locations/_clouds.md
@@ -259,4 +259,15 @@ The above example will create a name such as:
     
 Allowing you to more easily identify your virtual machines.
 
-  
\ No newline at end of file
+### More Details on Specific Clouds
+
+Clouds vary in the format of the identity, credential, endpoint, and region.
+Some also have their own idiosyncracies.  More details for configuring some 
common clouds
+is included below. You may also find these sources helpful:
+
+* The **[template brooklyn.properties]({{ site.path.guide 
}}/start/brooklyn.properties)** file
+  in the Getting Started guide
+  contains numerous examples of configuring specific clouds,
+  including the format of credentials and options for sometimes-fiddly private 
clouds.
+* The **[jclouds guides](https://jclouds.apache.org/guides)** describes 
low-level configuration
+  sometimes required for various clouds.

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2e792839/guide/ops/locations/_more-clouds.md
----------------------------------------------------------------------
diff --git a/guide/ops/locations/_more-clouds.md 
b/guide/ops/locations/_more-clouds.md
deleted file mode 100644
index 7107fa0..0000000
--- a/guide/ops/locations/_more-clouds.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-section: More Details on Specific Clouds
-title: More on Clouds
-section_type: inline
-section_position: 2
----
-
-### More Details on Specific Clouds
-
-To connect to a Cloud, Brooklyn requires appropriate credentials. These 
comprise the `identity` and
-`credential` in Brooklyn terminology.
-
-For private clouds (and for some clouds being targeted using a standard API), 
the `endpoint`
-must also be specified, which is the cloud's URL.  For public clouds, Brooklyn 
comes preconfigured
-with the endpoints, but many offer different choices of the `region` where you 
might want to deploy.
-
-Clouds vary in the format of the identity, credential, endpoint, and region.
-Some also have their own idiosyncracies.  More details for configuring some 
common clouds
-is included below. You may also find these sources helpful:
-
-* The **[template brooklyn.properties]({{ site.path.guide 
}}/start/brooklyn.properties)** file
-  in the Getting Started guide
-  contains numerous examples of configuring specific clouds,
-  including the format of credentials and options for sometimes-fiddly private 
clouds.
-* The **[jclouds guides](https://jclouds.apache.org/guides)** describes 
low-level configuration
-  sometimes required for various clouds.
-
-

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2e792839/guide/ops/locations/_openstack.md
----------------------------------------------------------------------
diff --git a/guide/ops/locations/_openstack.md 
b/guide/ops/locations/_openstack.md
index 242e7aa..cc45e0a 100644
--- a/guide/ops/locations/_openstack.md
+++ b/guide/ops/locations/_openstack.md
@@ -48,52 +48,48 @@ Configuration of floating IPs is as networks; specify the 
pools to use as anothe
 
 This is a basic inline YAML template for an OpenStack location:
 
-```
-location:
-  jclouds:clouds:openstack-nova:
-    endpoint: http://x.x.x.x:5000/v2.0/
-    identity: "your-tenant:your-username"
-    credential: your-password
-
-    # imageId, hardwareId, and loginUser* are optional
-    imageId: your-region-name/your-image-id
-    hardwareId: your-region-name/your-flavor-id
-    loginUser: 'ubuntu'
-    loginUser.privateKeyFile: /path/to/your/privatekey
-
-    jclouds.openstack-nova.auto-generate-keypairs: false
-    jclouds.openstack-nova.auto-create-floating-ips: true
+    location:
+        jclouds:clouds:openstack-nova:
+            endpoint: http://x.x.x.x:5000/v2.0/
+            identity: "your-tenant:your-username"
+            credential: your-password
+
+            # imageId, hardwareId, and loginUser* are optional
+            imageId: your-region-name/your-image-id
+            hardwareId: your-region-name/your-flavor-id
+            loginUser: 'ubuntu'
+            loginUser.privateKeyFile: /path/to/your/privatekey
+
+            jclouds.openstack-nova.auto-generate-keypairs: false
+            jclouds.openstack-nova.auto-create-floating-ips: true
 
-    templateOptions:
-      networks: [ "your-network-id" ]
-      floatingIpPoolNames: [ "your-floatingIp-pool" ]
-      securityGroups: ['your-security-group']
+            templateOptions:
+                networks: [ "your-network-id" ]
+                floatingIpPoolNames: [ "your-floatingIp-pool" ]
+                securityGroups: ['your-security-group']
 
-      # Optional if 'jclouds.openstack-nova.auto-generate-keypairs' is 
assigned to 'true'
-      keyPairName: "your-keypair"
-```
+                # Optional if 'jclouds.openstack-nova.auto-generate-keypairs' 
is assigned to 'true'
+                keyPairName: "your-keypair"
 
 This is the same OpenStack location in a format that can be added to your
 `brooklyn.properties` file:
 
-```
-brooklyn.location.named.My\ 
Openstack=jclouds:openstack-nova:http://x.x.x.x:5000/v2.0/
-brooklyn.location.named.My\ OpenStack.identity=your-tenant:your-username
-brooklyn.location.named.My\ OpenStack.credential=your-password
-brooklyn.location.named.My\ OpenStack.endpoint=http://x.x.x.x:5000/v2.0/
-
-brooklyn.location.named.My\ OpenStack.imageId=your-region-name/your-image-id
-brooklyn.location.named.My\ 
OpenStack.hardwareId=your-region-name/your-flavor-id
-brooklyn.location.named.My\ OpenStack.loginUser=ubuntu
-brooklyn.location.named.My\ 
OpenStack.loginUser.privateKeyFile=/path/to/your/privatekey
-brooklyn.location.named.My\ 
OpenStack.openstack-nova.auto-generate-keypairs=false
-brooklyn.location.named.My\ 
OpenStack.openstack-nova.auto-create-floating-ips=true
-
-brooklyn.location.named.My\ OpenStack.networks=your-network-id
-brooklyn.location.named.My\ OpenStack.floatingIpPoolNames=your-floatingIp-pool
-brooklyn.location.named.My\ OpenStack.securityGroups=your-security-group
-brooklyn.location.named.My\ OpenStack.keyPair=your-keypair
-```
+    brooklyn.location.named.My\ 
Openstack=jclouds:openstack-nova:http://x.x.x.x:5000/v2.0/
+    brooklyn.location.named.My\ OpenStack.identity=your-tenant:your-username
+    brooklyn.location.named.My\ OpenStack.credential=your-password
+    brooklyn.location.named.My\ OpenStack.endpoint=http://x.x.x.x:5000/v2.0/
+
+    brooklyn.location.named.My\ 
OpenStack.imageId=your-region-name/your-image-id
+    brooklyn.location.named.My\ 
OpenStack.hardwareId=your-region-name/your-flavor-id
+    brooklyn.location.named.My\ OpenStack.loginUser=ubuntu
+    brooklyn.location.named.My\ 
OpenStack.loginUser.privateKeyFile=/path/to/your/privatekey
+    brooklyn.location.named.My\ 
OpenStack.openstack-nova.auto-generate-keypairs=false
+    brooklyn.location.named.My\ 
OpenStack.openstack-nova.auto-create-floating-ips=true
+
+    brooklyn.location.named.My\ OpenStack.networks=your-network-id
+    brooklyn.location.named.My\ 
OpenStack.floatingIpPoolNames=your-floatingIp-pool
+    brooklyn.location.named.My\ OpenStack.securityGroups=your-security-group
+    brooklyn.location.named.My\ OpenStack.keyPair=your-keypair
 
 Chose a value of `your-flavor-id` from one of the defaults, or create your own 
flavor if
 you have administrator privileges.
@@ -102,17 +98,15 @@ For for more information, see the
 
 The default flavors are:
 
-```
-+-----+-----------+-----------+------+
-| ID  | Name      | Memory_MB | Disk |
-+-----+-----------+-----------+------+
-| 1   | m1.tiny   | 512       | 1    |
-| 2   | m1.small  | 2048      | 20   |
-| 3   | m1.medium | 4096      | 40   |
-| 4   | m1.large  | 8192      | 80   |
-| 5   | m1.xlarge | 16384     | 160  |
-+-----+-----------+-----------+------+
-```
+    +-----+-----------+-----------+------+
+    | ID  | Name      | Memory_MB | Disk |
+    +-----+-----------+-----------+------+
+    | 1   | m1.tiny   | 512       | 1    |
+    | 2   | m1.small  | 2048      | 20   |
+    | 3   | m1.medium | 4096      | 40   |
+    | 4   | m1.large  | 8192      | 80   |
+    | 5   | m1.xlarge | 16384     | 160  |
+    +-----+-----------+-----------+------+
 
 For an even more detailed example location configuration, consult the
 [template properties 
file](https://brooklyn.apache.org/v/latest/start/brooklyn.properties).
@@ -133,9 +127,9 @@ the current version of jclouds does not yet support.
 If you are having problems deploying to OpenStack, consult your Brooklyn debug 
log and
 look for the following:
 
-```
-"namespace": "http://docs.openstack.org/compute/ext/fake_xml";
-```
+
+    "namespace": "http://docs.openstack.org/compute/ext/fake_xml";
+
 
 If this appears, perform the following steps as a workaround:
 
@@ -147,23 +141,23 @@ configuration
 
 Here is a simple example template to be used with this workaround:
 
-```
-location:
-  jclouds:openstack-devtest-compute:
-    endpoint: http://x.x.x.x:5000/v2.0/
-    identity: "your-tenant:your-username"
-    credential: your-password
-    templateOptions:
-      networks: [ "your-network-id" ]
-      floatingIpPoolNames: [ "your-floatingIp-pool" ]
-```
+
+    location:
+        jclouds:openstack-devtest-compute:
+            endpoint: http://x.x.x.x:5000/v2.0/
+            identity: "your-tenant:your-username"
+            credential: your-password
+            templateOptions:
+                networks: [ "your-network-id" ]
+                floatingIpPoolNames: [ "your-floatingIp-pool" ]
+
 
 Note that the following values will be set by default when omitted above:
 
-```
-jclouds.keystone.credential-type=passwordCredentials
-jclouds.openstack-nova.auto-generate-keypairs: true
-jclouds.openstack-nova.auto-create-floating-ips: true
-```
+
+    jclouds.keystone.credential-type=passwordCredentials
+    jclouds.openstack-nova.auto-generate-keypairs: true
+    jclouds.openstack-nova.auto-create-floating-ips: true
+
 
 

Reply via email to