Merge pull request #1411 from deis/restore_rackspace

Restore rackspace

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 [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.
+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, DigitalOcean, 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.

client/README.rst

@@ -28,7 +28,7 @@ lightweight and flexible.
 Deis comes with out-of-the-box support for Ruby, Python, Node.js, Java,
 Clojure, Scala, Play, PHP, Perl, Dart and Go. However, Deis can deploy
 anything using Docker images or Heroku Buildpacks. Deis is designed to work
-with any cloud provider. Currently Amazon EC2 and DigitalOcean
+with any cloud provider. Currently Amazon EC2, Rackspace, and DigitalOcean
 are supported.
 
 

contrib/rackspace/README.md

@@ -1,12 +1,5 @@
 # Provision a Deis Cluster on Rackspace
 
-**WARNING: Unsupported**
-
-The most recent CoreOS image that Rackspace provides is too old. Rackspace regularly lags behind other
-cloud providers in updating its CoreOS images. Until Rackspace updates its images frequently enough
-for us to update CoreOS on Rackspace when we update the other cloud providers, Rackspace will remain
-an unsupported cloud platform for provisioning Deis. The instructions below remain as a reference.
-
 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`).
 
 ### Install supernova and its dependencies:

contrib/rackspace/provision-rackspace-cluster.sh

@@ -42,7 +42,7 @@ $CONTRIB_DIR/util/check-user-data.sh
 
 i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
     echo_yellow "Provisioning deis-$i..."
-    supernova production boot --image afb5ee19-4e6e-42c3-841c-9663e99b83ba --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
+    supernova production boot --image c3a4208a-3284-4e46-a99d-c29b56b457ba --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
     ((i = i + 1)) ; \
 done
 

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, 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.
+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, DigitalOcean, 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
 ------------

docs/installing_deis/provision-controller.rst

@@ -26,6 +26,16 @@ to provision a multi-node Deis cluster on `Amazon EC2`_.
 
 Please see `contrib/ec2`_ for details on using Deis on Amazon EC2.
 
+Rackspace
+---------
+
+The `contrib/rackspace` section of the Deis project includes shell
+scripts, documentation, and a cloud-config template to make it easy to
+provision a multi-node Deis cluster on Rackspace_ cloud.
+
+Please see `contrib/rackspace`_ for details on using Deis on
+Rackspace cloud.
+
 DigitalOcean
 ---------
 
@@ -56,7 +66,9 @@ Please see README.md_ for details on using Deis with Vagrant.
 .. _`CoreOS Documentation`: https://coreos.com/docs/
 .. _`Amazon EC2`: https://github.com/deis/deis/tree/master/contrib/ec2#readme
 .. _`contrib/ec2`: https://github.com/deis/deis/tree/master/contrib/ec2
+.. _Rackspace: https://github.com/deis/deis/tree/master/contrib/rackspace#readme
 .. _DigitalOcean: https://github.com/deis/deis/tree/master/contrib/digitalocean#readme
+.. _`contrib/rackspace`: https://github.com/deis/deis/tree/master/contrib/rackspace
 .. _`contrib/digitalocean`: https://github.com/deis/deis/tree/master/contrib/digitalocean
 .. _`contrib/bare-metal`: https://github.com/deis/deis/tree/master/contrib/bare-metal
 .. _Vagrant: http://www.vagrantup.com/

docs/installing_deis/ssl-endpoints.rst

@@ -64,6 +64,8 @@ the cluster will be encrypted while the internal components of Deis will still c
 HTTP. To enable SSL, you will need to open port 443 on the load balancer and forward it to port 80
 on the routers. See your vendor's specific instructions on installing SSL on your load balancer.
 
-For EC2, see their documentation on `installing an SSL cert for load balancing`_.
+For EC2, see their documentation on `installing an SSL cert for load balancing`_. For
+Rackspace, see their `Product FAQ`_.
 
 .. _`installing an SSL cert for load balancing`: http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/ssl-server-cert.html
+.. _`Product FAQ`: http://www.rackspace.com/knowledge_center/product-faq/cloud-load-balancers