From 7344d00bc3d1a9551f057166030cbf5a0a849d48 Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Wed, 9 Apr 2014 16:14:19 +0100 Subject: [PATCH] Fix issue with error on startup caused by use of brooklyn.jclouds in property file --- docs/use/guide/quickstart/brooklyn.properties | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/use/guide/quickstart/brooklyn.properties b/docs/use/guide/quickstart/brooklyn.properties index 8cb680c58a..cd2a6c21f2 100644 --- a/docs/use/guide/quickstart/brooklyn.properties +++ b/docs/use/guide/quickstart/brooklyn.properties @@ -26,16 +26,16 @@ # These should be an "Access Key ID" and "Secret Access Key" for your account. # This is configured at https://console.aws.amazon.com/iam/home?#security_credential . -brooklyn.jclouds.aws-ec2.identity = AKA_YOUR_ACCESS_KEY_ID -brooklyn.jclouds.aws-ec2.credential = YourSecretKeyWhichIsABase64EncodedString +brooklyn.location.jclouds.aws-ec2.identity = AKA_YOUR_ACCESS_KEY_ID +brooklyn.location.jclouds.aws-ec2.credential = YourSecretKeyWhichIsABase64EncodedString ## Rackspace Credentials -brooklyn.jclouds.rackspace-cloudservers-us.identity = ACCOUNT_USERNAME -brooklyn.jclouds.rackspace-cloudservers-us.credential = 0xApiKeyFromAccountSettingsAsHexString +brooklyn.location.jclouds.rackspace-cloudservers-us.identity = ACCOUNT_USERNAME +brooklyn.location.jclouds.rackspace-cloudservers-us.credential = 0xApiKeyFromAccountSettingsAsHexString # For UK you need a *different* account, at rackspace.co.uk account (disabled by default) -#brooklyn.jclouds.rackspace-cloudservers-uk.identity = ACCOUNT_USERNAME -#brooklyn.jclouds.rackspace-cloudservers-uk.credential = 0xApiKeyFromAccountSettingAsHexString +#brooklyn.location.jclouds.rackspace-cloudservers-uk.identity = ACCOUNT_USERNAME +#brooklyn.location.jclouds.rackspace-cloudservers-uk.credential = 0xApiKeyFromAccountSettingAsHexString ## Geoscaling Service (Used for global web fabric demo) https://www.geoscaling.com/dns2/ brooklyn.geoscaling.username = USERNAME @@ -129,20 +129,20 @@ brooklyn.geoscaling.primaryDomain = DOMAIN ## ## Comment out those that you don't need. ## Remember to define your identity and credential for each provider -## e.g: brooklyn.jclouds.aws-ec2.identity = ? -## brooklyn.jclouds.aws-ec2.credential = ? -## brooklyn.jclouds.cloudservers-us.identity = ? -## brooklyn.jclouds.cloudservers-us.credential = ? +## e.g: brooklyn.location.jclouds.aws-ec2.identity = ? +## brooklyn.location.jclouds.aws-ec2.credential = ? +## brooklyn.location.jclouds.cloudservers-us.identity = ? +## brooklyn.location.jclouds.cloudservers-us.credential = ? ## # Note: For the convenience of new users, we have specified Ubuntu 12.04 LTS AMIs within # AWS, deploying to m1.smalls, minimum. Ubuntu requires user = ubuntu. # Please change these to better suit your requirements. # (Note: If no parameters are set jclouds will pick AMIs at random, user=root, t1.micros.) -#brooklyn.jclouds.aws-ec2.identity = YOURAPIKEY -#brooklyn.jclouds.aws-ec2.credential = YOURSECRETKEY -brooklyn.jclouds.aws-ec2.minRam = 1600 -brooklyn.jclouds.aws-ec2.user=brooklyn +#brooklyn.location.jclouds.aws-ec2.identity = YOURAPIKEY +#brooklyn.location.jclouds.aws-ec2.credential = YOURSECRETKEY +brooklyn.location.jclouds.aws-ec2.minRam = 1600 +brooklyn.location.jclouds.aws-ec2.user=brooklyn brooklyn.location.named.AWS\ Virginia\ (us-east-1) = jclouds:aws-ec2:us-east-1 brooklyn.location.named.AWS\ Virginia\ (us-east-1).imageId = us-east-1/ami-d0f89fb9 brooklyn.location.named.AWS\ Virginia\ (us-east-1).user = ubuntu @@ -170,8 +170,8 @@ brooklyn.location.named.AWS\ Sao\ Paulo\ (sa-east-1).user = ubuntu # Similarly, here are definitions for HP Cloud - also Ubuntu 12.04 LTS # You specify your HP Credentials like this: -# brooklyn.jclouds.hpcloud-compute.identity = projectname:username -# brooklyn.jclouds.hpcloud-compute.credential = password +# brooklyn.location.jclouds.hpcloud-compute.identity = projectname:username +# brooklyn.location.jclouds.hpcloud-compute.credential = password # where username and password are the same as logging in to the web console, and # projectname can be found here: https://account.hpcloud.com/projects brooklyn.location.named.HP\ Cloud\ Arizona-1 = jclouds:hpcloud-compute:az-1.region-a.geo-1 @@ -234,12 +234,12 @@ brooklyn.location.named.Rackspace\ Sydney\ (syd) = jclouds:rackspace-cloudserver ## if you need to use Rackspace "first gen" API ## (note the "next gen" api configured above seems to be faster) -# brooklyn.jclouds.cloudservers-us.identity = YOURAPIKEY -# brooklyn.jclouds.cloudservers-us.credential = YOURSECRETKEY +# 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.jclouds.cloudservers-uk.identity = YOURAPIKEY -# brooklyn.jclouds.cloudservers-uk.credential = YOURSECRETKEY +# 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.named.SeverLove = jclouds:serverlove-z1-man