docs(contrib/ec2): fix up stack name customization

Author: carmstrong

contrib/ec2/provision-ec2-cluster.sh

@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 #
-# Usage: ./provision-ec2-cluster.sh
-#
+# Usage: ./provision-ec2-cluster.sh [name]
+# The [name] is the CloudFormation stack name, and defaults to 'deis'
+
+if [ -z "$1" ]
+  then
+    NAME=deis
+  else
+    NAME=$1
+fi
 
 set -e
 
@@ -34,7 +41,7 @@ $CONTRIB_DIR/util/check-user-data.sh
 # create an EC2 cloudformation stack based on CoreOS's default template
 aws cloudformation create-stack \
     --template-body "$(./gen-json.py)" \
-    --stack-name deis \
+    --stack-name $NAME \
     --parameters "$(<cloudformation.json)"
 
 echo_green "Your Deis cluster has successfully deployed to AWS CloudFormation."

contrib/ec2/update-ec2-cluster.sh

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 #
-# Usage: ./provision-ec2-cluster.sh [id]
-# The [id] defaults to 'deis'
-
+# Usage: ./update-ec2-cluster.sh [name]
+# The [name] is the CloudFormation stack name, and defaults to 'deis'
 
 if [ -z "$1" ]
   then
-    ELB_NAME=deis
+    NAME=deis
   else
-    ELB_NAME=$1
+    NAME=$1
 fi
 
 set -e
@@ -30,7 +29,7 @@ $CONTRIB_DIR/util/check-user-data.sh
 # update the deis EC2 cloudformation
 aws cloudformation update-stack \
     --template-body "$(./gen-json.py)" \
-    --stack-name $ELB_NAME \
+    --stack-name $NAME \
     --parameters "$(<cloudformation.json)"
 
 echo_green "Your Deis cluster CloudFormation has been successfully updated."

docs/installing_deis/aws.rst

@@ -151,9 +151,6 @@ Run the cloudformation provision script to spawn a new CoreOS cluster:
 
 .. code-block:: console
 
-    # Usage: ./provision-ec2-cluster.sh [id]
-    # Where id is internal reference id to the ELB, defaults to 'deis'
-
     $ cd contrib/ec2
     $ ./provision-ec2-cluster.sh
     {
@@ -162,6 +159,11 @@ Run the cloudformation provision script to spawn a new CoreOS cluster:
     Your Deis cluster has successfully deployed.
     Please wait for all instances to come up as "running" before continuing.
 
+.. note::
+
+    The default name of the CloudFormation stack will be ``deis``. You can specify a different name
+    with ``./provision-ec2-cluster.sh <name>``.
+
 Check the AWS EC2 web control panel and wait until "Status Checks" for all instances have passed.
 This will take several minutes.