Factor out EC2 parameters used to create master node, document them in-place.

Split EC2 params to sandbox-create.conf, add in-place docs there, to not
crowd README. Still, tweak README for better readability.

1 files changed, 15 insertions, 11 deletions

diff --git a/README b/README
index c598a5a..7760d87 100644
--- a/README
+++ b/README
@@ -40,38 +40,42 @@ link for this initial setup. In particular, have name of your EC2 keypair ready
 https://help.ubuntu.com/community/EC2StartersGuide
 
 
-Quick install:
+Installation procedure:
 
 bzr clone lp:linaro-android-build-tools
 cd linaro-android-build-tools/control
+
+Now review and edit sandbox-create.conf . You at least should have security
+groups set up properly before continuing. Once done, run:
+
 ./sandbox-create <name of your existing EC2 keypair>
 
-This will create complete Cloud Buildd setup, you just need to fill in EC2
-credentials which will be used to create build slave instances.
+This will create complete Cloud Buildd setup, and output URL to the system
+frontend. You just need to fill in EC2 credentials which will be used to
+create build slave instances.
 
-1. Open URL as output when 'sandbox-create' script finished in the browser,
-   append "/jenkins".
+1. Open provided URL in the browser, appending "/jenkins".
 2. Login as username: admin, password: admin.
 3. Go to "People" -> "Jenkins Admin" -> "Configure". Change password.
 4. Go to "Manage Jenkins" -> "Configure System". Search for "Access Key ID",
    "Secret Access Key" and fill in EC2 credentials.
 5. Now you need to create keypair which Jenkins will use to create slave
-   instances, this supposed to be automated by clicking on "Generate Key",
+   instances. This is supposed to be automated by clicking on "Generate Key",
    but does not work in latest Jenkins versions, so instead run:
 
    ec2-add-keypair jenkins@cloud-buildd >jenkins@cloud-buildd.rsa
 
-   Paste contents of jenkins@cloud-buildd.rsa into "EC2 RSA Private Key".
+   Paste contents of jenkins@cloud-buildd.rsa into "EC2 RSA Private Key" field.
 6. Click "Test Connection" and ensure you get "SUCCESS".
-7. Now save your changes and you're done.
+7. Now save your changes and you are done.
 
-In addition to the fully automated sandbox-create script which takes care of
-instance creation for a master node, there're following scripts with narrower
+In addition to the fully automated 'sandbox-create' script which takes care of
+instance creation for a master node, there are following scripts with narrower
 scope:
 
   control/setup-control-node-via-ssh <hostname>
       * This will set up existing instance/physical host as Cloud Buildd master
-      node
+      node.
   control/setup-control-node
       * This will set up Cloud Buildd control node on the current host, which
       should be a blank, freshly installed host/instance running Ubuntu Server