rename to poppy

README.rst

@@ -61,7 +61,7 @@ installed and running.
 
 2. Copy the Poppy config files to the directory ``~/.poppy``::
 
-    $ cp poppy/etc/cdn.conf ~/.poppy/poppy.conf
+    $ cp poppy/etc/poppy.conf ~/.poppy/poppy.conf
     $ cp poppy/etc/logging.conf ~/.poppy/logging.conf
 
 3. Find the ``[drivers:storage:cassandradb]`` section in
@@ -73,7 +73,7 @@ installed and running.
     keyspace = poppy
 
 4. By using cassandra storage plugin, you will need to create the default 
-   keyspace "cdn" on your cassandra host/cluster. So log into cqlsh, do::
+   keyspace "poppy" on your cassandra host/cluster. So log into cqlsh, do::
     
     cqlsh> CREATE KEYSPACE poppy WITH REPLICATION = { 'class' : 'SimpleStrategy' , 'replication_factor' :  1}  ;
 
@@ -144,7 +144,7 @@ Mac OSX
 
 4. Import the Cassandra Schema to set up the required tables that CDN will need::
     
-    Open ./cqlsh and import the /cdn/storage/cassandra/schema.cql file
+    Open ./cqlsh and import the /poppy/storage/cassandra/schema.cql file
 
 
 

docker/README.md

@@ -1,7 +1,7 @@
 Building the Cassandra Docker Image
 --------------------------------------
 
-From the docker/cassandra-cdn folder:
+From the docker/cassandra folder:
 
     $ docker build -t db .
 
@@ -30,5 +30,5 @@ Where local ip is the ip address of your running docker container
 Import Schema
 ---------------
 
-Import the schema file from the cdn/storage/cassandra/schema.cql file.
+Import the schema file from the poppy/storage/cassandra/schema.cql file.
 

etc/logging.conf

@@ -14,12 +14,12 @@ handlers=devel
 [logger_server]
 level=DEBUG
 handlers=devel
-qualname=cdn-server
+qualname=poppy-server
 
 [logger_combined]
 level=DEBUG
 handlers=devel
-qualname=cdn-combined
+qualname=poppy-combined
 
 [handler_production]
 class=handlers.SysLogHandler
@@ -31,7 +31,7 @@ args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
 class=FileHandler
 level=DEBUG
 formatter=normal_with_name
-args=('cdn.log', 'w')
+args=('poppy.log', 'w')
 
 [handler_devel]
 class=StreamHandler

etc/poppy.conf

@@ -1,6 +1,6 @@
 # By default, this should live in one of:
-# ~/.cdn/cdn.conf
-# /etc/cdn/cdn.conf
+# ~/.poppy/poppy.conf
+# /etc/poppy/poppy.conf
 
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
@@ -10,7 +10,7 @@
 ;debug = False
 
 # Log to this file
-log_file = cdn.log
+log_file = poppy.log
 
 ;auth_strategy =
 
@@ -42,14 +42,14 @@ port = 8888
 
 [drivers:storage:mongodb]
 uri = mongodb://localhost
-database = cdn
+database = poppy
 
 [drivers:storage:cassandra]
 cluster = "localhost"
-keyspace = cdn
+keyspace = poppy
 
 [drivers:storage:mockdb]
-database = cdn
+database = poppy
 
 [drivers:provider:fastly]
 apikey = "MYAPIKEY"

poppy/bootstrap.py

@@ -13,11 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from poppy.common import decorators
-from poppy.openstack.common import log
 from oslo.config import cfg
 from stevedore import driver, extension
 
+from poppy.common import decorators
+from poppy.openstack.common import log
+
 
 LOG = log.getLogger(__name__)
 

poppy/cmd/server.py

@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo.config import cfg
+
 from poppy import bootstrap
 from poppy.common import cli
-from oslo.config import cfg
 
 
 @cli.runnable

tests/unit/provider/fastly/test_driver.py

@@ -13,13 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import fastly
 import mock
 
-from poppy.provider.fastly import driver
+import fastly
 from oslo.config import cfg
+
+from poppy.provider.fastly import driver
 from tests.unit import base
 
+
 FASTLY_OPTIONS = [
     cfg.StrOpt('apikey',
                default='123456',