Fixing unescaped quote in nova-CC-install.sh script plus formatting fixes to multinode install

75 files changed, 0 insertions, 539 deletions

diff --git a/doc/source/adminguide/multi.node.install.rst b/doc/source/adminguide/multi.node.install.rst
index 64286f6ec..5918b0d38 100644
--- a/doc/source/adminguide/multi.node.install.rst
+++ b/doc/source/adminguide/multi.node.install.rst
@@ -274,8 +274,6 @@ Step 9 - Spinning up a VM for testing
 
 The image that you will use here will be a ttylinux image, so this is a limited function server. You will be able to ping and SSH to this instance, but it is in no way a full production VM.  
 
-UPDATE: Due to `bug 661159 <https://bugs.launchpad.net/nova/+bug/661159>`_, we can’t use images without ramdisks yet, so we can’t use the classic Ubuntu cloud images from http://uec-images.ubuntu.com/releases/ yet. For the sake of this tutorial, we’ll use the `ttylinux images from Scott Moser instead <http://smoser.brickies.net/ubuntu/ttylinux-uec/>`_.
-
 Download the image, and publish to your bucket:
 
 ::
diff --git a/doc/source/api/autoindex.rst b/doc/source/api/autoindex.rst
deleted file mode 100644
index 6265b082b..000000000
--- a/doc/source/api/autoindex.rst
+++ /dev/null
@@ -1,99 +0,0 @@
-.. toctree::
-   :maxdepth: 1
-
-   nova..adminclient.rst
-   nova..api.cloud.rst
-   nova..api.ec2.admin.rst
-   nova..api.ec2.apirequest.rst
-   nova..api.ec2.cloud.rst
-   nova..api.ec2.images.rst
-   nova..api.ec2.metadatarequesthandler.rst
-   nova..api.openstack.auth.rst
-   nova..api.openstack.backup_schedules.rst
-   nova..api.openstack.faults.rst
-   nova..api.openstack.flavors.rst
-   nova..api.openstack.images.rst
-   nova..api.openstack.servers.rst
-   nova..api.openstack.sharedipgroups.rst
-   nova..auth.dbdriver.rst
-   nova..auth.fakeldap.rst
-   nova..auth.ldapdriver.rst
-   nova..auth.manager.rst
-   nova..auth.signer.rst
-   nova..cloudpipe.pipelib.rst
-   nova..compute.disk.rst
-   nova..compute.instance_types.rst
-   nova..compute.manager.rst
-   nova..compute.monitor.rst
-   nova..compute.power_state.rst
-   nova..context.rst
-   nova..crypto.rst
-   nova..db.api.rst
-   nova..db.sqlalchemy.api.rst
-   nova..db.sqlalchemy.models.rst
-   nova..db.sqlalchemy.session.rst
-   nova..exception.rst
-   nova..fakerabbit.rst
-   nova..flags.rst
-   nova..image.service.rst
-   nova..manager.rst
-   nova..network.linux_net.rst
-   nova..network.manager.rst
-   nova..objectstore.bucket.rst
-   nova..objectstore.handler.rst
-   nova..objectstore.image.rst
-   nova..objectstore.stored.rst
-   nova..process.rst
-   nova..quota.rst
-   nova..rpc.rst
-   nova..scheduler.chance.rst
-   nova..scheduler.driver.rst
-   nova..scheduler.manager.rst
-   nova..scheduler.simple.rst
-   nova..server.rst
-   nova..service.rst
-   nova..test.rst
-   nova..tests.access_unittest.rst
-   nova..tests.api.fakes.rst
-   nova..tests.api.openstack.fakes.rst
-   nova..tests.api.openstack.test_api.rst
-   nova..tests.api.openstack.test_auth.rst
-   nova..tests.api.openstack.test_faults.rst
-   nova..tests.api.openstack.test_flavors.rst
-   nova..tests.api.openstack.test_images.rst
-   nova..tests.api.openstack.test_ratelimiting.rst
-   nova..tests.api.openstack.test_servers.rst
-   nova..tests.api.openstack.test_sharedipgroups.rst
-   nova..tests.api.test_wsgi.rst
-   nova..tests.api_integration.rst
-   nova..tests.api_unittest.rst
-   nova..tests.auth_unittest.rst
-   nova..tests.cloud_unittest.rst
-   nova..tests.compute_unittest.rst
-   nova..tests.declare_flags.rst
-   nova..tests.fake_flags.rst
-   nova..tests.flags_unittest.rst
-   nova..tests.network_unittest.rst
-   nova..tests.objectstore_unittest.rst
-   nova..tests.process_unittest.rst
-   nova..tests.quota_unittest.rst
-   nova..tests.real_flags.rst
-   nova..tests.rpc_unittest.rst
-   nova..tests.runtime_flags.rst
-   nova..tests.scheduler_unittest.rst
-   nova..tests.service_unittest.rst
-   nova..tests.twistd_unittest.rst
-   nova..tests.validator_unittest.rst
-   nova..tests.virt_unittest.rst
-   nova..tests.volume_unittest.rst
-   nova..twistd.rst
-   nova..utils.rst
-   nova..validate.rst
-   nova..virt.connection.rst
-   nova..virt.fake.rst
-   nova..virt.images.rst
-   nova..virt.libvirt_conn.rst
-   nova..virt.xenapi.rst
-   nova..volume.driver.rst
-   nova..volume.manager.rst
-   nova..wsgi.rst
diff --git a/doc/source/api/nova..adminclient.rst b/doc/source/api/nova..adminclient.rst
deleted file mode 100644
index 35fa839e1..000000000
--- a/doc/source/api/nova..adminclient.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..adminclient` Module
-==============================================================================
-.. automodule:: nova..adminclient
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.ec2.admin.rst b/doc/source/api/nova..api.ec2.admin.rst
deleted file mode 100644
index 4e9ab308b..000000000
--- a/doc/source/api/nova..api.ec2.admin.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.ec2.admin` Module
-==============================================================================
-.. automodule:: nova..api.ec2.admin
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.ec2.apirequest.rst b/doc/source/api/nova..api.ec2.apirequest.rst
deleted file mode 100644
index c17a2ff3a..000000000
--- a/doc/source/api/nova..api.ec2.apirequest.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.ec2.apirequest` Module
-==============================================================================
-.. automodule:: nova..api.ec2.apirequest
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.ec2.cloud.rst b/doc/source/api/nova..api.ec2.cloud.rst
deleted file mode 100644
index f6145c217..000000000
--- a/doc/source/api/nova..api.ec2.cloud.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.ec2.cloud` Module
-==============================================================================
-.. automodule:: nova..api.ec2.cloud
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.ec2.metadatarequesthandler.rst b/doc/source/api/nova..api.ec2.metadatarequesthandler.rst
deleted file mode 100644
index 75f5169e5..000000000
--- a/doc/source/api/nova..api.ec2.metadatarequesthandler.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.ec2.metadatarequesthandler` Module
-==============================================================================
-.. automodule:: nova..api.ec2.metadatarequesthandler
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.auth.rst b/doc/source/api/nova..api.openstack.auth.rst
deleted file mode 100644
index 8c3f8f2da..000000000
--- a/doc/source/api/nova..api.openstack.auth.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.auth` Module
-==============================================================================
-.. automodule:: nova..api.openstack.auth
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.backup_schedules.rst b/doc/source/api/nova..api.openstack.backup_schedules.rst
deleted file mode 100644
index 6b406f12d..000000000
--- a/doc/source/api/nova..api.openstack.backup_schedules.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.backup_schedules` Module
-==============================================================================
-.. automodule:: nova..api.openstack.backup_schedules
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.faults.rst b/doc/source/api/nova..api.openstack.faults.rst
deleted file mode 100644
index 7b25561f7..000000000
--- a/doc/source/api/nova..api.openstack.faults.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.faults` Module
-==============================================================================
-.. automodule:: nova..api.openstack.faults
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.flavors.rst b/doc/source/api/nova..api.openstack.flavors.rst
deleted file mode 100644
index 0deb724de..000000000
--- a/doc/source/api/nova..api.openstack.flavors.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.flavors` Module
-==============================================================================
-.. automodule:: nova..api.openstack.flavors
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.images.rst b/doc/source/api/nova..api.openstack.images.rst
deleted file mode 100644
index 82bd5f1e8..000000000
--- a/doc/source/api/nova..api.openstack.images.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.images` Module
-==============================================================================
-.. automodule:: nova..api.openstack.images
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.servers.rst b/doc/source/api/nova..api.openstack.servers.rst
deleted file mode 100644
index c36856ea2..000000000
--- a/doc/source/api/nova..api.openstack.servers.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.servers` Module
-==============================================================================
-.. automodule:: nova..api.openstack.servers
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..api.openstack.sharedipgroups.rst b/doc/source/api/nova..api.openstack.sharedipgroups.rst
deleted file mode 100644
index 07632acc8..000000000
--- a/doc/source/api/nova..api.openstack.sharedipgroups.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..api.openstack.sharedipgroups` Module
-==============================================================================
-.. automodule:: nova..api.openstack.sharedipgroups
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..auth.dbdriver.rst b/doc/source/api/nova..auth.dbdriver.rst
deleted file mode 100644
index 7de68b6e0..000000000
--- a/doc/source/api/nova..auth.dbdriver.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..auth.dbdriver` Module
-==============================================================================
-.. automodule:: nova..auth.dbdriver
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..auth.fakeldap.rst b/doc/source/api/nova..auth.fakeldap.rst
deleted file mode 100644
index ca8a3ad4d..000000000
--- a/doc/source/api/nova..auth.fakeldap.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..auth.fakeldap` Module
-==============================================================================
-.. automodule:: nova..auth.fakeldap
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..auth.ldapdriver.rst b/doc/source/api/nova..auth.ldapdriver.rst
deleted file mode 100644
index c44463522..000000000
--- a/doc/source/api/nova..auth.ldapdriver.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..auth.ldapdriver` Module
-==============================================================================
-.. automodule:: nova..auth.ldapdriver
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..auth.manager.rst b/doc/source/api/nova..auth.manager.rst
deleted file mode 100644
index bc5ce2ec3..000000000
--- a/doc/source/api/nova..auth.manager.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..auth.manager` Module
-==============================================================================
-.. automodule:: nova..auth.manager
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..auth.signer.rst b/doc/source/api/nova..auth.signer.rst
deleted file mode 100644
index aad824ead..000000000
--- a/doc/source/api/nova..auth.signer.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..auth.signer` Module
-==============================================================================
-.. automodule:: nova..auth.signer
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..cloudpipe.pipelib.rst b/doc/source/api/nova..cloudpipe.pipelib.rst
deleted file mode 100644
index 054aaf484..000000000
--- a/doc/source/api/nova..cloudpipe.pipelib.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..cloudpipe.pipelib` Module
-==============================================================================
-.. automodule:: nova..cloudpipe.pipelib
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..compute.disk.rst b/doc/source/api/nova..compute.disk.rst
deleted file mode 100644
index 6410af6f3..000000000
--- a/doc/source/api/nova..compute.disk.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..compute.disk` Module
-==============================================================================
-.. automodule:: nova..compute.disk
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..compute.instance_types.rst b/doc/source/api/nova..compute.instance_types.rst
deleted file mode 100644
index d206ff3a4..000000000
--- a/doc/source/api/nova..compute.instance_types.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..compute.instance_types` Module
-==============================================================================
-.. automodule:: nova..compute.instance_types
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..compute.manager.rst b/doc/source/api/nova..compute.manager.rst
deleted file mode 100644
index 33a337c39..000000000
--- a/doc/source/api/nova..compute.manager.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..compute.manager` Module
-==============================================================================
-.. automodule:: nova..compute.manager
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..compute.monitor.rst b/doc/source/api/nova..compute.monitor.rst
deleted file mode 100644
index a91169ecd..000000000
--- a/doc/source/api/nova..compute.monitor.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..compute.monitor` Module
-==============================================================================
-.. automodule:: nova..compute.monitor
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..compute.power_state.rst b/doc/source/api/nova..compute.power_state.rst
deleted file mode 100644
index 41b1080e5..000000000
--- a/doc/source/api/nova..compute.power_state.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..compute.power_state` Module
-==============================================================================
-.. automodule:: nova..compute.power_state
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..context.rst b/doc/source/api/nova..context.rst
deleted file mode 100644
index 9de1adb24..000000000
--- a/doc/source/api/nova..context.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..context` Module
-==============================================================================
-.. automodule:: nova..context
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..crypto.rst b/doc/source/api/nova..crypto.rst
deleted file mode 100644
index af9f63634..000000000
--- a/doc/source/api/nova..crypto.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..crypto` Module
-==============================================================================
-.. automodule:: nova..crypto
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..db.api.rst b/doc/source/api/nova..db.api.rst
deleted file mode 100644
index 6d998fbb2..000000000
--- a/doc/source/api/nova..db.api.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..db.api` Module
-==============================================================================
-.. automodule:: nova..db.api
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..db.sqlalchemy.api.rst b/doc/source/api/nova..db.sqlalchemy.api.rst
deleted file mode 100644
index 76d0c1bd3..000000000
--- a/doc/source/api/nova..db.sqlalchemy.api.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..db.sqlalchemy.api` Module
-==============================================================================
-.. automodule:: nova..db.sqlalchemy.api
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..db.sqlalchemy.models.rst b/doc/source/api/nova..db.sqlalchemy.models.rst
deleted file mode 100644
index 9c795d7f5..000000000
--- a/doc/source/api/nova..db.sqlalchemy.models.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..db.sqlalchemy.models` Module
-==============================================================================
-.. automodule:: nova..db.sqlalchemy.models
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..db.sqlalchemy.session.rst b/doc/source/api/nova..db.sqlalchemy.session.rst
deleted file mode 100644
index cbfd6416a..000000000
--- a/doc/source/api/nova..db.sqlalchemy.session.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..db.sqlalchemy.session` Module
-==============================================================================
-.. automodule:: nova..db.sqlalchemy.session
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..exception.rst b/doc/source/api/nova..exception.rst
deleted file mode 100644
index 97ac6b752..000000000
--- a/doc/source/api/nova..exception.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..exception` Module
-==============================================================================
-.. automodule:: nova..exception
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..fakerabbit.rst b/doc/source/api/nova..fakerabbit.rst
deleted file mode 100644
index f1e27c266..000000000
--- a/doc/source/api/nova..fakerabbit.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..fakerabbit` Module
-==============================================================================
-.. automodule:: nova..fakerabbit
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..flags.rst b/doc/source/api/nova..flags.rst
deleted file mode 100644
index 08165be44..000000000
--- a/doc/source/api/nova..flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..flags` Module
-==============================================================================
-.. automodule:: nova..flags
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..image.service.rst b/doc/source/api/nova..image.service.rst
deleted file mode 100644
index 78ef1ecca..000000000
--- a/doc/source/api/nova..image.service.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..image.service` Module
-==============================================================================
-.. automodule:: nova..image.service
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..manager.rst b/doc/source/api/nova..manager.rst
deleted file mode 100644
index 576902491..000000000
--- a/doc/source/api/nova..manager.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..manager` Module
-==============================================================================
-.. automodule:: nova..manager
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..network.linux_net.rst b/doc/source/api/nova..network.linux_net.rst
deleted file mode 100644
index 7af78d5ad..000000000
--- a/doc/source/api/nova..network.linux_net.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..network.linux_net` Module
-==============================================================================
-.. automodule:: nova..network.linux_net
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..network.manager.rst b/doc/source/api/nova..network.manager.rst
deleted file mode 100644
index 0ea705533..000000000
--- a/doc/source/api/nova..network.manager.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..network.manager` Module
-==============================================================================
-.. automodule:: nova..network.manager
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..objectstore.bucket.rst b/doc/source/api/nova..objectstore.bucket.rst
deleted file mode 100644
index 3bfdf639c..000000000
--- a/doc/source/api/nova..objectstore.bucket.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..objectstore.bucket` Module
-==============================================================================
-.. automodule:: nova..objectstore.bucket
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..objectstore.handler.rst b/doc/source/api/nova..objectstore.handler.rst
deleted file mode 100644
index 0eb8c4efb..000000000
--- a/doc/source/api/nova..objectstore.handler.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..objectstore.handler` Module
-==============================================================================
-.. automodule:: nova..objectstore.handler
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..objectstore.image.rst b/doc/source/api/nova..objectstore.image.rst
deleted file mode 100644
index fa4c971f1..000000000
--- a/doc/source/api/nova..objectstore.image.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..objectstore.image` Module
-==============================================================================
-.. automodule:: nova..objectstore.image
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..objectstore.stored.rst b/doc/source/api/nova..objectstore.stored.rst
deleted file mode 100644
index 2b1d997a3..000000000
--- a/doc/source/api/nova..objectstore.stored.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..objectstore.stored` Module
-==============================================================================
-.. automodule:: nova..objectstore.stored
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..quota.rst b/doc/source/api/nova..quota.rst
deleted file mode 100644
index 4140d95d6..000000000
--- a/doc/source/api/nova..quota.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..quota` Module
-==============================================================================
-.. automodule:: nova..quota
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..rpc.rst b/doc/source/api/nova..rpc.rst
deleted file mode 100644
index 5b2a9b8e2..000000000
--- a/doc/source/api/nova..rpc.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..rpc` Module
-==============================================================================
-.. automodule:: nova..rpc
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..scheduler.chance.rst b/doc/source/api/nova..scheduler.chance.rst
deleted file mode 100644
index 89c074c8f..000000000
--- a/doc/source/api/nova..scheduler.chance.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..scheduler.chance` Module
-==============================================================================
-.. automodule:: nova..scheduler.chance
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..scheduler.driver.rst b/doc/source/api/nova..scheduler.driver.rst
deleted file mode 100644
index 793ed9c7b..000000000
--- a/doc/source/api/nova..scheduler.driver.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..scheduler.driver` Module
-==============================================================================
-.. automodule:: nova..scheduler.driver
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..scheduler.manager.rst b/doc/source/api/nova..scheduler.manager.rst
deleted file mode 100644
index d0fc7c423..000000000
--- a/doc/source/api/nova..scheduler.manager.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..scheduler.manager` Module
-==============================================================================
-.. automodule:: nova..scheduler.manager
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..scheduler.simple.rst b/doc/source/api/nova..scheduler.simple.rst
deleted file mode 100644
index dacc2cf30..000000000
--- a/doc/source/api/nova..scheduler.simple.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..scheduler.simple` Module
-==============================================================================
-.. automodule:: nova..scheduler.simple
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..service.rst b/doc/source/api/nova..service.rst
deleted file mode 100644
index 2d2dfcf2e..000000000
--- a/doc/source/api/nova..service.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..service` Module
-==============================================================================
-.. automodule:: nova..service
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..test.rst b/doc/source/api/nova..test.rst
deleted file mode 100644
index a6bdb6f1f..000000000
--- a/doc/source/api/nova..test.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..test` Module
-==============================================================================
-.. automodule:: nova..test
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.fakes.rst b/doc/source/api/nova..tests.api.fakes.rst
deleted file mode 100644
index 5728b18f3..000000000
--- a/doc/source/api/nova..tests.api.fakes.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.fakes` Module
-==============================================================================
-.. automodule:: nova..tests.api.fakes
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.fakes.rst b/doc/source/api/nova..tests.api.openstack.fakes.rst
deleted file mode 100644
index 4a9ff5938..000000000
--- a/doc/source/api/nova..tests.api.openstack.fakes.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.fakes` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.fakes
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_api.rst b/doc/source/api/nova..tests.api.openstack.test_api.rst
deleted file mode 100644
index 68106d221..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_api.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_api` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_api
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_auth.rst b/doc/source/api/nova..tests.api.openstack.test_auth.rst
deleted file mode 100644
index 9f0011669..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_auth.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_auth` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_auth
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_faults.rst b/doc/source/api/nova..tests.api.openstack.test_faults.rst
deleted file mode 100644
index b839ae8a3..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_faults.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_faults` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_faults
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_flavors.rst b/doc/source/api/nova..tests.api.openstack.test_flavors.rst
deleted file mode 100644
index 471fac56e..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_flavors.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_flavors` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_flavors
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_images.rst b/doc/source/api/nova..tests.api.openstack.test_images.rst
deleted file mode 100644
index 57ae93c8c..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_images.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_images` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_images
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_ratelimiting.rst b/doc/source/api/nova..tests.api.openstack.test_ratelimiting.rst
deleted file mode 100644
index 9a857f795..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_ratelimiting.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_ratelimiting` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_ratelimiting
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_servers.rst b/doc/source/api/nova..tests.api.openstack.test_servers.rst
deleted file mode 100644
index ea602e6ab..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_servers.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_servers` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_servers
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.openstack.test_sharedipgroups.rst b/doc/source/api/nova..tests.api.openstack.test_sharedipgroups.rst
deleted file mode 100644
index 1fad49147..000000000
--- a/doc/source/api/nova..tests.api.openstack.test_sharedipgroups.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.openstack.test_sharedipgroups` Module
-==============================================================================
-.. automodule:: nova..tests.api.openstack.test_sharedipgroups
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.api.test_wsgi.rst b/doc/source/api/nova..tests.api.test_wsgi.rst
deleted file mode 100644
index 8e79caa4d..000000000
--- a/doc/source/api/nova..tests.api.test_wsgi.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.api.test_wsgi` Module
-==============================================================================
-.. automodule:: nova..tests.api.test_wsgi
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.declare_flags.rst b/doc/source/api/nova..tests.declare_flags.rst
deleted file mode 100644
index 524e72e91..000000000
--- a/doc/source/api/nova..tests.declare_flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.declare_flags` Module
-==============================================================================
-.. automodule:: nova..tests.declare_flags
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.fake_flags.rst b/doc/source/api/nova..tests.fake_flags.rst
deleted file mode 100644
index a8dc3df36..000000000
--- a/doc/source/api/nova..tests.fake_flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.fake_flags` Module
-==============================================================================
-.. automodule:: nova..tests.fake_flags
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.objectstore_unittest.rst b/doc/source/api/nova..tests.objectstore_unittest.rst
deleted file mode 100644
index 0ae252f04..000000000
--- a/doc/source/api/nova..tests.objectstore_unittest.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.objectstore_unittest` Module
-==============================================================================
-.. automodule:: nova..tests.objectstore_unittest
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.real_flags.rst b/doc/source/api/nova..tests.real_flags.rst
deleted file mode 100644
index e9c0d1abd..000000000
--- a/doc/source/api/nova..tests.real_flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.real_flags` Module
-==============================================================================
-.. automodule:: nova..tests.real_flags
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.runtime_flags.rst b/doc/source/api/nova..tests.runtime_flags.rst
deleted file mode 100644
index 984e21199..000000000
--- a/doc/source/api/nova..tests.runtime_flags.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.runtime_flags` Module
-==============================================================================
-.. automodule:: nova..tests.runtime_flags
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..twistd.rst b/doc/source/api/nova..twistd.rst
deleted file mode 100644
index d4145396d..000000000
--- a/doc/source/api/nova..twistd.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..twistd` Module
-==============================================================================
-.. automodule:: nova..twistd
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..utils.rst b/doc/source/api/nova..utils.rst
deleted file mode 100644
index 1131d1080..000000000
--- a/doc/source/api/nova..utils.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..utils` Module
-==============================================================================
-.. automodule:: nova..utils
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..virt.connection.rst b/doc/source/api/nova..virt.connection.rst
deleted file mode 100644
index caf766765..000000000
--- a/doc/source/api/nova..virt.connection.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..virt.connection` Module
-==============================================================================
-.. automodule:: nova..virt.connection
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..virt.fake.rst b/doc/source/api/nova..virt.fake.rst
deleted file mode 100644
index 06ecdbf7d..000000000
--- a/doc/source/api/nova..virt.fake.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..virt.fake` Module
-==============================================================================
-.. automodule:: nova..virt.fake
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..virt.images.rst b/doc/source/api/nova..virt.images.rst
deleted file mode 100644
index 4fdeb7af8..000000000
--- a/doc/source/api/nova..virt.images.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..virt.images` Module
-==============================================================================
-.. automodule:: nova..virt.images
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..virt.libvirt_conn.rst b/doc/source/api/nova..virt.libvirt_conn.rst
deleted file mode 100644
index 7fb8aed5f..000000000
--- a/doc/source/api/nova..virt.libvirt_conn.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..virt.libvirt_conn` Module
-==============================================================================
-.. automodule:: nova..virt.libvirt_conn
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..volume.driver.rst b/doc/source/api/nova..volume.driver.rst
deleted file mode 100644
index 51f5c0729..000000000
--- a/doc/source/api/nova..volume.driver.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..volume.driver` Module
-==============================================================================
-.. automodule:: nova..volume.driver
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..volume.manager.rst b/doc/source/api/nova..volume.manager.rst
deleted file mode 100644
index 91a192a8f..000000000
--- a/doc/source/api/nova..volume.manager.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..volume.manager` Module
-==============================================================================
-.. automodule:: nova..volume.manager
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..wsgi.rst b/doc/source/api/nova..wsgi.rst
deleted file mode 100644
index 0bff1c332..000000000
--- a/doc/source/api/nova..wsgi.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..wsgi` Module
-==============================================================================
-.. automodule:: nova..wsgi
-  :members:
-  :undoc-members:
-  :show-inheritance: