docs(contrib): fix ec2 and rackspace formatting

Fixes formatting issues with both READMEs and attempt to standardize
the shell scripts.

Author: carmstrong

contrib/ec2/README.md

@@ -1,15 +1,15 @@
-Provision a Deis Cluster on Amazon EC2
-======================================
+# Provision a Deis Cluster on Amazon EC2
 
-1. Install the [AWS Command Line Interface][aws-cli]:
+## Install the [AWS Command Line Interface][aws-cli]:
 ```console
 $ pip install awscli
 Downloading/unpacking awscli
   Downloading awscli-1.3.6.tar.gz (173kB): 173kB downloaded
   ...
 ```
 
-2. Run `aws configure` to set your AWS credentials:
+## Configure aws-cli
+Run `aws configure` to set your AWS credentials:
 ```console
 $ aws configure
 AWS Access Key ID [None]: ***************
@@ -18,9 +18,11 @@ Default region name [None]: us-west-1
 Default output format [None]:
 ```
 
-3. Upload a new keypair to AWS, ensuring that the name of the keypair is set to "deis".
+## Upload keys
+Upload a new keypair to AWS, ensuring that the name of the keypair is set to "deis".
 
-4. Edit [cloudformation.json][cf-params], ensuring to add a new discovery URL.
+## Customize cloudformation.json
+Edit [cloudformation.json][cf-params], ensuring to add a new discovery URL.
 You can get a new one by sending a new request to http://discovery.etcd.io/new.
 ```console
     {
@@ -33,7 +35,8 @@ about the discovery URL, see http://discovery.etcd.io for more information. You
 read more on how you can customize this cluster by looking at the
 [CoreOS EC2 template][template] and applying it to [cloudformation.json][cf-params].
 
-5. Run the [cloudformation provision script][pro-script] to spawn a new CoreOS cluster:
+## Run the provision script
+Run the [cloudformation provision script][pro-script] to spawn a new CoreOS cluster:
 ```console
 $ ./provision-ec2-cluster.sh
 {
@@ -43,7 +46,8 @@ Your Deis cluster has successfully deployed.
 Please wait for it to come up, then run ./initialize-ec2-cluster.sh
 ```
 
-6. Once the cluster is up, get the hostname of any of the machines from EC2, set
+## Initialize the cluster
+Once the cluster is up, get the hostname of any of the machines from EC2, set
 FLEETCTL_TUNNEL, then run [the init script][init-script] to bootstrap the cluster
 remotely:
 ```console
@@ -63,7 +67,8 @@ Job deis-router.service started on aec641dc.../172.31.21.4
 done!
 ```
 
-7. After that, wait for the components to come up, check which host the controller is
+## Run Deis!
+After that, wait for the components to come up, check which host the controller is
 running on and register with Deis!
 ```
 $ fleetctl list-units

contrib/ec2/initialize-ec2-cluster.sh

@@ -9,17 +9,19 @@ THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
 CONTRIB_DIR=$(dirname $THIS_DIR)
 ROOT_DIR=$(dirname $CONTRIB_DIR)
 
+source $CONTRIB_DIR/utils.sh
+
 # check for fleetctl in $PATH
 if ! which fleetctl > /dev/null; then
-  echo 'Please install fleetctl and ensure it is in your $PATH.'
-  echo 'See https://github.com/coreos/fleet for more information'
+  echo_red 'Please install fleetctl and ensure it is in your $PATH.'
+  echo_red 'See https://github.com/coreos/fleet for more information'
   exit 1
 fi
 
 if [ -z "$FLEETCTL_TUNNEL" ]
 then
-    echo 'Please set $FLEETCTL_TUNNEL.'
-    echo 'See https://github.com/coreos/fleet/blob/master/Documentation/remote-access.md'
+    echo_red 'Please set $FLEETCTL_TUNNEL.'
+    echo_red 'See https://github.com/coreos/fleet/blob/master/Documentation/remote-access.md'
     exit 1
 fi
 
@@ -34,4 +36,5 @@ do
   popd > /dev/null
 done
 
-echo "done!"
+echo_green "Done! Inspect the state of the services with: fleetctl list-units"
+echo_green "Once all the services are running, you can register with your Deis cluster: deis register 1.2.3.4:8000"

contrib/ec2/provision-ec2-cluster.sh

@@ -8,15 +8,17 @@ set -e
 THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
 CONTRIB_DIR=$(dirname $THIS_DIR)
 
+source $CONTRIB_DIR/utils.sh
+
 # check for Deis' general dependencies
 if ! "$CONTRIB_DIR/check-deis-deps.sh"; then
-  echo 'Deis is missing some dependencies.'
+  echo_red 'Deis is missing some dependencies.'
   exit 1
 fi
 
 # check for EC2 API tools in $PATH
 if ! which aws > /dev/null; then
-  echo 'Please install the AWS command-line tool and ensure it is in your $PATH.'
+  echo_red 'Please install the AWS command-line tool and ensure it is in your $PATH.'
   exit 1
 fi
 
@@ -26,5 +28,5 @@ aws cloudformation create-stack \
     --stack-name deis \
     --parameters "$(<cloudformation.json)"
 
-echo "Your Deis cluster has successfully deployed to AWS CloudFormation."
-echo "Please continue to follow the instructions in the README."
+echo_green "Your Deis cluster has successfully deployed to AWS CloudFormation."
+echo_green "Please continue to follow the instructions in the README."

contrib/rackspace/README.md

@@ -1,16 +1,16 @@
-Provision a Deis Cluster on Rackspace
-======================================
+# Provision a Deis Cluster on Rackspace
 
 We'll mostly be following the [CoreOS on Rackspace](https://coreos.com/docs/running-coreos/cloud-providers/rackspace/) guide. You'll need to have a sane python environment with pip already installed (`sudo easy_install pip`).
 
-1. Install supernova and its dependencies:
+### Install supernova and its dependencies:
 ```console
 $ sudo pip install keyring
 $ sudo pip install rackspace-novaclient
 $ sudo pip install supernova
 ```
 
-2. Edit `~/.supernova` to match the following:
+### Configure supernova
+Edit `~/.supernova` to match the following:
 ```
 [production]
 OS_AUTH_URL = https://identity.api.rackspacecloud.com/v2.0/
@@ -23,16 +23,18 @@ OS_AUTH_SYSTEM = rackspace
 
 Your account ID is displayed in the upper right-hand corner of the cloud control panel UI, and your API key can be found on the Account Settings page.
 
-3. Choose an existing keypair or generate a new one, if desired. Tell supernova about the key pair and give it an identifiable name:
+### Set up your keys
+Choose an existing keypair or generate a new one, if desired. Tell supernova about the key pair and give it an identifiable name:
 
-``console
-supernova production keypair-add --pub-key ~/.ssh/deis.pub deis-key
+```console
+$ supernova production keypair-add --pub-key ~/.ssh/deis.pub deis-key
 ```
 
-4. Edit [cloud-config.yml](cloud-config.yml) and add a discovery URL. This URL will be used by all nodes in this Deis cluster.
-You can get a new discovery URL by sending a request to http://discovery.etcd.io/new.
+### Customize cloud-config.yml
+Edit [cloud-config.yml](cloud-config.yml) and add a discovery URL. This URL will be used by all nodes in this Deis cluster. You can get a new discovery URL by sending a request to http://discovery.etcd.io/new.
 
-5. Run the [Rackspace provision script](provision-rackspace-cluster.sh) to spawn a new CoreOS cluster.
+### Run the provision script
+Run the [Rackspace provision script](provision-rackspace-cluster.sh) to spawn a new CoreOS cluster.
 You'll need to provide the name of the key pair you just added. Optionally, you can also specify a flavor name.
 ```console
 $ ./provision-rackspace-cluster.sh
@@ -45,7 +47,8 @@ By default, the script will provision 3 servers. You can override this by settin
 $ DEIS_NUM_INSTANCES=5 ./provision-rackspace-cluster.sh deis-key
 ```
 
-6. Once the cluster is up, get the IP address for any of the machines in the cluster, set
+### Initialize the cluster
+Once the cluster is up, get the IP address for any of the machines in the cluster, set
 FLEETCTL_TUNNEL, and run [the init script](initialize-rackspace-cluster.sh) to bootstrap the cluster
 remotely:
 ```console
@@ -65,7 +68,8 @@ Job deis-router.service scheduled to 73c7d285.../23.253.218.114
 done!
 ```
 
-7. After that, wait for the components to come up, check which host the controller is
+### Use Deis!
+After that, wait for the components to come up, check which host the controller is
 running on and register with Deis!
 ```
 $ fleetctl list-units