You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/10/15 15:02:58 UTC
[1/2] incubator-brooklyn git commit: Update brooklyn.properties
Rackspace template to add next gen
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 32346b80b -> b0cadef73
Update brooklyn.properties Rackspace template to add next gen
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d87fa5b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d87fa5b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d87fa5b2
Branch: refs/heads/master
Commit: d87fa5b2bfeda715d61208740965c17d0b3a568d
Parents: 0c3e7ea
Author: Mike Zaccardo <mi...@cloudsoftcorp.com>
Authored: Wed Oct 14 17:46:08 2015 -0500
Committer: Mike Zaccardo <mi...@cloudsoftcorp.com>
Committed: Wed Oct 14 17:46:08 2015 -0500
----------------------------------------------------------------------
docs/guide/start/brooklyn.properties | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d87fa5b2/docs/guide/start/brooklyn.properties
----------------------------------------------------------------------
diff --git a/docs/guide/start/brooklyn.properties b/docs/guide/start/brooklyn.properties
index 92054e5..f517556 100644
--- a/docs/guide/start/brooklyn.properties
+++ b/docs/guide/start/brooklyn.properties
@@ -219,24 +219,36 @@ brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
# brooklyn.location.named.OpenHosting = jclouds:openhosting-east1
+## Rackspace (Next Gen)
# brooklyn.location.named.Rackspace\ Chicago\ (ord) = jclouds:rackspace-cloudservers-us:ORD
# brooklyn.location.named.Rackspace\ Dallas\ (dfw) = jclouds:rackspace-cloudservers-us:DFW
# brooklyn.location.named.Rackspace\ Hong\ Kong\ (hkg) = jclouds:rackspace-cloudservers-us:HKG
# brooklyn.location.named.Rackspace\ Northern\ Virginia\ (iad) = jclouds:rackspace-cloudservers-us:IAD
# brooklyn.location.named.Rackspace\ Sydney\ (syd) = jclouds:rackspace-cloudservers-us:SYD
-## for UK you will need a separate account with rackspace.co.uk
-# brooklyn.location.named.Rackspace\ London\ (lon) = jclouds:rackspace-cloudservers-uk
-## if you need to use Rackspace "first gen" API
+## For UK you will need a separate account with rackspace.co.uk
+# brooklyn.location.named.Rackspace\ London\ (lon) = jclouds:rackspace-cloudservers-uk:LON
+
+# brooklyn.location.jclouds.rackspace-cloudservers-us.identity = YOUR_USERNAME
+# brooklyn.location.jclouds.rackspace-cloudservers-us.credential = YOUR_API_KEY
+
+## Separate account credentials for the UK
+# brooklyn.location.jclouds.rackspace-cloudservers-uk.identity = YOUR_USERNAME
+# brooklyn.location.jclouds.rackspace-cloudservers-uk.credential = YOUR_API_KEY
+
+## Rackspace (First Gen)
+## If you need to use Rackspace "first gen" API
## (note the "next gen" api configured above seems to be faster)
-# brooklyn.location.jclouds.cloudservers-us.identity = YOURAPIKEY
-# brooklyn.location.jclouds.cloudservers-us.credential = YOURSECRETKEY
# brooklyn.location.named.Rackspace\ US\ (First Gen) = jclouds:cloudservers-us
-## and as with next gen, first gen requires a separate acct for the UK:
-# brooklyn.location.jclouds.cloudservers-uk.identity = YOURAPIKEY
-# brooklyn.location.jclouds.cloudservers-uk.credential = YOURSECRETKEY
# brooklyn.location.named.Rackspace\ UK\ (First Gen) = jclouds:cloudservers-uk
+# brooklyn.location.jclouds.cloudservers-us.identity = YOUR_USERNAME
+# brooklyn.location.jclouds.cloudservers-us.credential = YOUR_API_KEY
+
+## Separate account credentials for the UK
+# brooklyn.location.jclouds.cloudservers-uk.identity = YOUR_USERNAME
+# brooklyn.location.jclouds.cloudservers-uk.credential = YOUR_API_KEY
+
# brooklyn.location.named.SeverLove = jclouds:serverlove-z1-man
# brooklyn.location.named.SkaliCloud = jclouds:skalicloud-sdg-my
[2/2] incubator-brooklyn git commit: This closes #958
Posted by sj...@apache.org.
This closes #958
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b0cadef7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b0cadef7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b0cadef7
Branch: refs/heads/master
Commit: b0cadef73dcb33e9f21531b62a948702e0e17e2b
Parents: 32346b8 d87fa5b
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Oct 15 14:02:41 2015 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Oct 15 14:02:41 2015 +0100
----------------------------------------------------------------------
docs/guide/start/brooklyn.properties | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------