From 20396c05d138cd4056e958b9467af4e739dd946a Mon Sep 17 00:00:00 2001
From: Anantha Arunachalam <anantha.arunachalam@rackspace.com>
Date: Wed, 27 May 2015 18:24:55 -0400
Subject: [PATCH] Updated README with additional dependencies

Change-Id: I57aed7a2c8b50eaa0bf00c3b40fc321d843b0d36
---
 README.rst                    | 42 +++++++++++++++++++++++++----------
 requirements/requirements.txt |  2 ++
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/README.rst b/README.rst
index 57059de2..a29d94ba 100644
--- a/README.rst
+++ b/README.rst
@@ -71,7 +71,7 @@ installed and running.
     [drivers:storage:cassandra]
     cluster = "localhost"
     keyspace = poppy
-	migrations_path = /home/poppy/poppy/storage/cassandra/migrations
+    migrations_path = /home/poppy/poppy/storage/cassandra/migrations
 
 4. By using cassandra storage plugin, you will need to create the default 
    keyspace "poppy" on your cassandra host/cluster. So log into cqlsh, do::
@@ -91,21 +91,20 @@ installed and running.
 7. Install general requirements::
 
     $ pip install -r requirements/requirements.txt
-
-   Install Requirements for each Provider configured::
-
-    $ pip install -r poppy/providers/fastly/requirements.txt
   
    Run the following so you can see the results of any changes you
    make to the code without having to reinstall the package each time::
     
     $ pip install -e .
 
+  To install additional dependencies, see `Additional Dependencies`_.  
+    
+
 8. Install and start zookeeper driver::
 
     http://zookeeper.apache.org/doc/trunk/zookeeperStarted.html
 
-	or more easily use a zookeeper docker:
+    or more easily use a zookeeper docker:
 
     https://registry.hub.docker.com/u/jplock/zookeeper/
 
@@ -131,7 +130,7 @@ similar to this::
     Content-Type: application/json-home
     Cache-Control: max-age=86400
 
-10. To run unit/functional test::
+12. To run unit/functional test::
 
     $ tox
 
@@ -150,6 +149,30 @@ Then start a poppy server::
     $ tox -- --exclude=none
 
 
+Additional Dependencies
+-------------------------------------------------
+
+Ubuntu 14.04
+-----------------------------
+
+For Python 2.7::
+
+    $ sudo apt-get install python-dev
+
+For Python 3.4::
+
+    $ sudo apt-get install python3.4-dev 
+
+For PyPy::
+
+    $ sudo apt-get install pypy-dev
+
+Install these two packages regardless of the Python version::
+
+    $ sudo apt-get install libffi6 libffi-dev
+
+    $ sudo apt-get install libssl-dev
+
 
 Installing Cassandra Locally
 -----------------------------
@@ -173,10 +196,6 @@ Mac OSX
 
     CREATE KEYSPACE poppy WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
 
-4. Import the Cassandra Schema to set up the required tables that CDN will need::
-    
-    Open ./cqlsh and import the /poppy/storage/cassandra/schema.cql file
-
 
 
 Running tests
@@ -194,4 +213,3 @@ And then run tests::
 .. _`CassandraDB` : http://cassandra.apache.org
 .. _`pyenv` : https://github.com/yyuu/pyenv/
 .. _`virtualenv` : https://pypi.python.org/pypi/virtualenv/
-
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 8b7ffead..ac66864a 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,3 +1,4 @@
+
 -r common.txt
 -r docs.txt
 -r transport/pecan.txt
@@ -7,3 +8,4 @@
 -r provider/cloudfront.txt
 -r provider/fastly.txt
 -r provider/maxcdn.txt
+-r distributed_task/taskflow.txt