Merge pull request #1776 from nathansamson/realcoreosdo

Use Real CoreOS on DigitalOcean

Author: Matthew Fisher

contrib/digitalocean/README.md

@@ -1,42 +1,31 @@
 # Provision a Deis Cluster on DigitalOcean
 
-## 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).
-
-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 DigitalOcean API.
+## Install docl and authorize:
+The docl gem consumes the DigitalOcean API.
 ```console
-$ gem install tugboat
-$ tugboat authorize
+$ gem install docl
 ```
-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 DigitalOcean:
+Before you can authorize you need to [create a Personal Access Token](https://www.digitalocean.com/community/tutorials/how-to-use-the-digitalocean-api-v2). Make sure you create a read & write token.
+Copy paste the token (make sure you also save it somewhere encrypted) before you continue to the next step.
+
 ```console
-$ tugboat add-key deis
+$ docl authorize
 ```
 
-Then, get the ID of the key:
+## Upload keys
+Choose an SSH keypair to use for Deis and import it to DigitalOcean:
 ```console
-$ tugboat keys
+$ docl upload_key deis ~/.ssh/deis.pub
 ```
+This will print the ID of the uploaded key. Copy and paste the ID, you will need it in a later step.
 
-## Create a Deis image:
+In case you forget the ID of the public key you can retrieve it later with the following command:
 ```console
-$ ./provision-digitalocean-deis-image.sh <SSH KEY ID> [REGION_ID]
+$ docl keys
 ```
 
 ## Choose number of instances
@@ -53,44 +42,35 @@ Deis clusters of less than 3 nodes are unsupported.
 ## Deploy cluster
 Run the provision script:
 ```console
-$ ./provision-do-cluster.sh <REGION_ID> <IMAGE_ID> <SSH_ID> <SIZE>
+$ ./provision-do-cluster.sh <REGION_ID> <SSH_ID> <SIZE>
 ```
 
-Not all regions allow private networks. Choose one which does (at the time of this writing, NY 2,
-Amsterdam 2, Singapore 1 or London 1) - check the web UI for the current private network support.
+Not all regions allow private networks. Choose one which does (at the time of this writing, NY 2 & 3,
+Amsterdam 2  & 3, Singapore 1 or London 1) - check the web UI for the current private network support.
 
-You can enumerate all the regions with:
+You can enumerate all of the supported regions with:
 
 ```console
-$ tugboat regions
+$ docl regions --private_networking --metadata
 ```
 
-The provisioning script uses a 512 MB droplet by default because for image creation
-more memory is not needed. Deis controller nodes will need at least 2 GB to even start all
+Deis controller nodes will need at least 2 GB to even start all
 the services. Add the memory requirements of deployed applications and choose an adequate
-droplet size. The default is 8 GB (ID "65"). You can enumerate all sizes with:
+droplet size. The default is 8 GB. Specify the size with NGB, where N is 2, 4, 8, 16, 32 or 64.
 
-```console
-$ tugboat sizes
-```
-
-## Choose number of routers
-By default, the Makefile will provision 1 router. You can override this by setting `DEIS_NUM_ROUTERS`:
-```console
-$ export DEIS_NUM_ROUTERS=2
-```
+This will print the IP addresses of the initialized machines.
 
 ## Initialize the cluster
-Once the cluster is up, get the IPs of any of the machines using `tugboat droplets`, set
-DEISCTL_TUNNEL to one of these IPs:
+set DEISCTL_TUNNEL to one of the IPs of the virtual machines (these are printed on the console in a previous step). You can also login to the web interface of DigitalOcean to see the Public IP addresses.
+
 ```console
 $ export DEISCTL_TUNNEL=23.253.219.94
 $ deisctl install platform && deisctl start platform
 ```
-The script will deploy Deis and make sure the services start properly.
+Deisctl will deploy Deis and make sure the services are started properly. Grab a coffee.
 
 ### Configure DNS
-You'll need to configure DNS records so you can access applications hosted on Deis. See [Configuring DNS](http://docs.deis.io/en/latest/operations/configure-dns/) for details.
+You'll need to configure DNS records so you can access applications hosted on Deis. See [Configuring DNS](http://docs.deis.io/en/latest/installing_deis/configure-dns/) for details.
 
 ### Use Deis!
 After that, register with Deis!