Merge branch 'master' of https://github.com/ThoughtWorksInc/OpenStack-EC2-Driver

README.md

@@ -55,9 +55,9 @@ Snapshot
 4. Refer to Step 3 in Quick Setup to edit nova.conf
 5. Restart nova
   - `~/devstack/rejoin-stack.sh`
-  - go to the nova-cpu screen (`ctrl+a`, `6`)
+  - go to the nova-cpu screen (`ctrl+a`, `7`)
   - restart the process with `ctrl+c`, press up, and then enter
-  - go to nova-api (screen 5), and repeat
+  - go to nova-api (screen 6), and repeat
   
 The driver should now be loaded. The contents of the repository is mapped to `/opt/stack/nova/nova/virt/ec2/`, and you can edit it directly from your host computer with an IDE of your choice.
 

ec2driver_config.py

@@ -1,8 +0,0 @@
-import os
-
-if os.environ.get('MOCK_EC2'):
-    print "test environment"
-    from ec2driver_test_config import *
-else:
-    print "prod env"
-    from ec2driver_standard_config import *