Merge pull request #1352 from deis/add_do_to_docs

docs(*): add back references to DigitalOcean support

Author: carmstrong

README.md

@@ -9,7 +9,7 @@ Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy an
 
 # Deploying Deis
 
-Deis is a set of Docker containers that can be deployed anywhere including public cloud, private cloud, bare metal or your workstation. Decide where you'd like to deploy Deis, then follow the deployment-specific documentation for [Rackspace](contrib/rackspace/README.md), [EC2](contrib/ec2/README.md), or [bare-metal](contrib/bare-metal/README.md) provisioning. Documentation for other platforms is forthcoming. Want to see a particular platform supported? Open an [issue](https://github.com/deis/deis/issues/new) and we'll investigate.
+Deis is a set of Docker containers that can be deployed anywhere including public cloud, private cloud, bare metal or your workstation. Decide where you'd like to deploy Deis, then follow the deployment-specific documentation for [Rackspace](contrib/rackspace/README.md), [EC2](contrib/ec2/README.md), [DigitalOcean](contrib/digitalocean/README.md) or [bare-metal](contrib/bare-metal/README.md) provisioning. Documentation for other platforms is forthcoming. Want to see a particular platform supported? Open an [issue](https://github.com/deis/deis/issues/new) and we'll investigate.
 
 Trying out Deis? Continue following these instructions for a local cluster setup. This is also a great Deis testing/development environment.
 
@@ -81,7 +81,7 @@ Use `make run` to start all Deis components. This can take some time - the regis
 $ make run
 ```
 
-Your Vagrant VM is accessible at `local.deisapp.com` (or `local3.deisapp.com`/`local5.deisapp.com`). For clusters on other platforms (EC2, Rackspace, bare metal, etc.), see our guide to [Configuring DNS](http://docs.deis.io/en/latest/installing_deis/configure-dns/).
+Your Vagrant VM is accessible at `local.deisapp.com` (or `local3.deisapp.com`/`local5.deisapp.com`). For clusters on other platforms (EC2, Rackspace, DigitalOcean, bare metal, etc.), see our guide to [Configuring DNS](http://docs.deis.io/en/latest/installing_deis/configure-dns/).
 
 ## Testing the cluster
 Integration tests and corresponding documentation can be found under the `test/` folder.

contrib/digitalocean/README.md

@@ -1,26 +1,30 @@
-# Provision a Deis Cluster on Digital Ocean
+# Provision a Deis Cluster on DigitalOcean
 
-Note that Digital Ocean does not support CoreOS images natively. To work around this, the provision
-scripts for Digital Ocean first create a CoreOS image which will be used for provisioning the cluster.
-
-Digital Ocean support was contributed by [sttts](https://github.com/sttts). The CoreOS bootstrapping
+## Note on Deis support for DigitalOcean
+DigitalOcean support was contributed by [sttts](https://github.com/sttts). The CoreOS bootstrapping
 is heavily based on [Levi Aul's code](https://gist.github.com/tsutsu/490f35f48897df0f5173).
 
-To deploy Deis to Digital Ocean:
+Note that DigitalOcean does not support CoreOS images natively. To work around this, the provision
+scripts for DigitalOcean first create a CoreOS image which will be used for provisioning the cluster.
+
+Until native DigitalOcean support for CoreOS is implemented, this workaround is likely to be more fragile than deploying
+Deis to other cloud platforms which support CoreOS natively.
+
+UPDATE: As of July 15, 2014, native CoreOS support on DigitalOcean is [planned](http://digitalocean.uservoice.com/forums/136585-digital-ocean/suggestions/4250154-suport-coreos-as-a-deployment-platform).
 
 ## Customize cloud-config.yml
 Edit [user-data](../coreos/user-data) 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.
 
 ## Install tugboat and authorize:
-The tugboat gem consumes the Digital Ocean API.
+The tugboat gem consumes the DigitalOcean API.
 ```console
 $ gem install tugboat
 $ tugboat authorize
 ```
 You can leave all but the client and API keys as the defaults.
 
 ## Upload keys
-Choose an SSH keypair to use for Deis and import it to Digital Ocean:
+Choose an SSH keypair to use for Deis and import it to DigitalOcean:
 ```console
 $ tugboat add-key deis
 ```

contrib/digitalocean/provision-digitalocean-deis-image.sh

@@ -8,7 +8,7 @@ CONTRIB_DIR=$(dirname $THIS_DIR)
 source $CONTRIB_DIR/utils.sh
 
 if ! which tugboat &>/dev/null; then
-	echo_red 'Digital Ocean command line client tugboat not found.'
+	echo_red 'DigitalOcean command line client tugboat not found.'
 	exit 1
 fi
 

contrib/digitalocean/provision-do-cluster.sh

@@ -23,13 +23,13 @@ fi
 # check that the CoreOS user-data file is valid
 $CONTRIB_DIR/util/check-user-data.sh
 
-# launch the Deis cluster on Digital Ocean
+# launch the Deis cluster on DigitalOcean
 i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
     NAME=deis-$i
     echo_yellow "Provisioning ${NAME}..."
     tugboat create $NAME -r $1 -i $2 -p true -k $3 -s $4
     ((i = i + 1)) ; \
 done
 
-echo_green "Your Deis cluster has successfully deployed to Digital Ocean."
+echo_green "Your Deis cluster has successfully deployed to DigitalOcean."
 echo_green "Please continue to follow the instructions in the README."

docs/installing_deis/configure-dns.rst

@@ -9,7 +9,7 @@ Configure DNS
 For local clusters, we've created the DNS record ``local.deisapp.com`` which resolves to the IP of the first VM, 172.17.8.100.
 You can use ``local.deisapp.com`` to both log into the controller and to access applications that you've deployed (they will be subdomains of ``local.deisapp.com``, like ``happy-unicorn.local.deisapp.com``). Similarly, you can use ``local3.deisapp.com`` or ``local5.deisapp.com`` for 3- and 5-node clusters, respectively. No DNS configuration is necessary for local clusters.
 
-For Deis clusters hosted elsewhere (EC2, Rackspace, bare metal, etc.), DNS records will need to be created to point to the cluster. For a one-node cluster, we schedule and launch one router, and deis-router and deis-controller will run on the same host. So, the DNS record specified below can be configured to point to this one machine.
+For Deis clusters hosted elsewhere (EC2, Rackspace, DigitalOcean, bare metal, etc.), DNS records will need to be created to point to the cluster. For a one-node cluster, we schedule and launch one router, and deis-router and deis-controller will run on the same host. So, the DNS record specified below can be configured to point to this one machine.
 
 On a multi-node cluster, however, there are probably multiple routers, and the controller will likely be scheduled on a separate machine. As mentioned in :ref:`configure-load-balancers`, a load balancer is recommended in this scenario.
 
@@ -24,7 +24,7 @@ Deis requires one wildcard DNS record. Assuming ``myapps.com`` is the top-level
 
 Apps can then be accessed via ``appname.myapps.com``, and the Deis controller can be accessed at ``deis.myapps.com``.
 
-This record is necessary for all deployments of Deis (EC2, Rackspace, bare metal, etc.). Local clusters can use the domain ``local.deisapp.com``, ``local3.deisapp.com``, or ``local5.deiaspp.com``.
+This record is necessary for all deployments of Deis (EC2, Rackspace, DigitalOcean, bare metal, etc.). Local clusters can use the domain ``local.deisapp.com``, ``local3.deisapp.com``, or ``local5.deiaspp.com``.
 
 Using xip.io
 ------------