merged trunk, added recent nova.sh

MANIFEST.in

@@ -13,9 +13,7 @@ include nova/cloudpipe/client.ovpn.template
 include nova/compute/fakevirtinstance.xml
 include nova/compute/interfaces.template
 include nova/virt/interfaces.template
-include nova/virt/libvirt.qemu.xml.template
-include nova/virt/libvirt.uml.xml.template
-include nova/virt/libvirt.xen.xml.template
+include nova/virt/libvirt.*.xml.template
 include nova/tests/CA/
 include nova/tests/CA/cacert.pem
 include nova/tests/CA/private/

bin/nova-api

@@ -38,15 +38,17 @@ from nova import server
 
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
+flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
 flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
+flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
 def main(_args):
     from nova import api
     from nova import wsgi
     server = wsgi.Server()
-    server.start(api.API('os'), FLAGS.osapi_port)
-    server.start(api.API('ec2'), FLAGS.ec2api_port)
+    server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
+    server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
     server.wait()
 
 

contrib/nova.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 DIR=`pwd`
 CMD=$1
-SOURCE_BRANCH=lp:~anso/nova/deploy
+SOURCE_BRANCH=lp:nova
 if [ -n "$2" ]; then
     SOURCE_BRANCH=$2
 fi
-DIRNAME=deploy
+DIRNAME=nova
 NOVA_DIR=$DIR/$DIRNAME
 if [ -n "$3" ]; then
     NOVA_DIR=$DIR/$3
@@ -17,15 +17,17 @@ if [ ! -n "$HOST_IP" ]; then
     #             you should explicitly set HOST_IP in your environment
     HOST_IP=`ifconfig  | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
 fi
+
 USE_MYSQL=${USE_MYSQL:-0}
 MYSQL_PASS=${MYSQL_PASS:-nova}
 TEST=${TEST:-0}
-USE_LDAP=${USE_LDAP:-1}
+USE_LDAP=${USE_LDAP:-0}
 LIBVIRT_TYPE=${LIBVIRT_TYPE:-qemu}
-NET_MAN=${NET_MAN:-VlanManager}
-# NOTE(vish): If you are using FlatDHCP make sure that this is not your
-#             public interface. You can comment it out for local usage
-BRIDGE_DEV=eth0
+NET_MAN=${NET_MAN:-FlatDHCPManager}
+# NOTE(vish): If you are using FlatDHCP on multiple hosts, set the interface
+#             below but make sure that the interface doesn't already have an
+#             ip or you risk breaking things.
+# FLAT_INTERFACE=eth0
 
 if [ "$USE_MYSQL" == 1 ]; then
     SQL_CONN=mysql://root:$MYSQL_PASS@localhost/nova
@@ -47,7 +49,6 @@ cat >/etc/nova/nova-manage.conf << NOVA_CONF_EOF
 --FAKE_subdomain=ec2
 --network_manager=nova.network.manager.$NET_MAN
 --cc_host=$HOST_IP
---cc_dmz=$HOST_IP
 --routing_source_ip=$HOST_IP
 --sql_connection=$SQL_CONN
 --auth_driver=nova.auth.$AUTH
@@ -120,9 +121,6 @@ if [ "$CMD" == "run" ]; then
     rm -rf $NOVA_DIR/networks
     mkdir -p $NOVA_DIR/networks
     $NOVA_DIR/tools/clean-vlans
-    sleep 3
-    ifdown eth0
-    ifup eth0
     if [ ! -d "$NOVA_DIR/images" ]; then
         ln -s $DIR/images $NOVA_DIR/images
     fi
@@ -151,11 +149,6 @@ if [ "$CMD" == "run" ]; then
     screen_it scheduler "$NOVA_DIR/bin/nova-scheduler --flagfile=/etc/nova/nova-manage.conf"
     screen_it volume "$NOVA_DIR/bin/nova-volume --flagfile=/etc/nova/nova-manage.conf"
     screen_it test ". $NOVA_DIR/novarc"
-
-    sleep 3
-
-    $NOVA_DIR/bin/nova-manage service enable `hostname` nova-compute
-    $NOVA_DIR/bin/nova-manage service enable `hostname` nova-volume
     screen -S nova -x
 fi
 
@@ -179,4 +172,5 @@ if [ "$CMD" == "scrub" ]; then
     else
         virsh list | grep i- | awk '{print \$1}' | xargs -n1 virsh destroy
     fi
+    vblade-persist ls | grep vol- | awk '{print \$1\" \"\$2}' | xargs -n2 vblade-persist destroy
 fi

contrib/puppet/templates/production/nova-common.conf.erb

@@ -46,7 +46,6 @@
 --quota_gigabytes=100
 --use_nova_chains=True
 --input_chain=services
---FAKE_subdomain=ec2
 --use_project_ca=True
 --fixed_ip_disassociate_timeout=300
 --api_max_requests=1

doc/.autogenerated

@@ -0,0 +1,97 @@
+source/api/nova..adminclient.rst
+source/api/nova..api.cloud.rst
+source/api/nova..api.ec2.admin.rst
+source/api/nova..api.ec2.apirequest.rst
+source/api/nova..api.ec2.cloud.rst
+source/api/nova..api.ec2.images.rst
+source/api/nova..api.ec2.metadatarequesthandler.rst
+source/api/nova..api.openstack.auth.rst
+source/api/nova..api.openstack.backup_schedules.rst
+source/api/nova..api.openstack.faults.rst
+source/api/nova..api.openstack.flavors.rst
+source/api/nova..api.openstack.images.rst
+source/api/nova..api.openstack.servers.rst
+source/api/nova..api.openstack.sharedipgroups.rst
+source/api/nova..auth.dbdriver.rst
+source/api/nova..auth.fakeldap.rst
+source/api/nova..auth.ldapdriver.rst
+source/api/nova..auth.manager.rst
+source/api/nova..auth.signer.rst
+source/api/nova..cloudpipe.pipelib.rst
+source/api/nova..compute.disk.rst
+source/api/nova..compute.instance_types.rst
+source/api/nova..compute.manager.rst
+source/api/nova..compute.monitor.rst
+source/api/nova..compute.power_state.rst
+source/api/nova..context.rst
+source/api/nova..crypto.rst
+source/api/nova..db.api.rst
+source/api/nova..db.sqlalchemy.api.rst
+source/api/nova..db.sqlalchemy.models.rst
+source/api/nova..db.sqlalchemy.session.rst
+source/api/nova..exception.rst
+source/api/nova..fakerabbit.rst
+source/api/nova..flags.rst
+source/api/nova..image.service.rst
+source/api/nova..manager.rst
+source/api/nova..network.linux_net.rst
+source/api/nova..network.manager.rst
+source/api/nova..objectstore.bucket.rst
+source/api/nova..objectstore.handler.rst
+source/api/nova..objectstore.image.rst
+source/api/nova..objectstore.stored.rst
+source/api/nova..process.rst
+source/api/nova..quota.rst
+source/api/nova..rpc.rst
+source/api/nova..scheduler.chance.rst
+source/api/nova..scheduler.driver.rst
+source/api/nova..scheduler.manager.rst
+source/api/nova..scheduler.simple.rst
+source/api/nova..server.rst
+source/api/nova..service.rst
+source/api/nova..test.rst
+source/api/nova..tests.access_unittest.rst
+source/api/nova..tests.api.fakes.rst
+source/api/nova..tests.api.openstack.fakes.rst
+source/api/nova..tests.api.openstack.test_api.rst
+source/api/nova..tests.api.openstack.test_auth.rst
+source/api/nova..tests.api.openstack.test_faults.rst
+source/api/nova..tests.api.openstack.test_flavors.rst
+source/api/nova..tests.api.openstack.test_images.rst
+source/api/nova..tests.api.openstack.test_ratelimiting.rst
+source/api/nova..tests.api.openstack.test_servers.rst
+source/api/nova..tests.api.openstack.test_sharedipgroups.rst
+source/api/nova..tests.api.test_wsgi.rst
+source/api/nova..tests.api_integration.rst
+source/api/nova..tests.api_unittest.rst
+source/api/nova..tests.auth_unittest.rst
+source/api/nova..tests.cloud_unittest.rst
+source/api/nova..tests.compute_unittest.rst
+source/api/nova..tests.declare_flags.rst
+source/api/nova..tests.fake_flags.rst
+source/api/nova..tests.flags_unittest.rst
+source/api/nova..tests.network_unittest.rst
+source/api/nova..tests.objectstore_unittest.rst
+source/api/nova..tests.process_unittest.rst
+source/api/nova..tests.quota_unittest.rst
+source/api/nova..tests.real_flags.rst
+source/api/nova..tests.rpc_unittest.rst
+source/api/nova..tests.runtime_flags.rst
+source/api/nova..tests.scheduler_unittest.rst
+source/api/nova..tests.service_unittest.rst
+source/api/nova..tests.twistd_unittest.rst
+source/api/nova..tests.validator_unittest.rst
+source/api/nova..tests.virt_unittest.rst
+source/api/nova..tests.volume_unittest.rst
+source/api/nova..twistd.rst
+source/api/nova..utils.rst
+source/api/nova..validate.rst
+source/api/nova..virt.connection.rst
+source/api/nova..virt.fake.rst
+source/api/nova..virt.images.rst
+source/api/nova..virt.libvirt_conn.rst
+source/api/nova..virt.xenapi.rst
+source/api/nova..volume.driver.rst
+source/api/nova..volume.manager.rst
+source/api/nova..wsgi.rst
+source/api/autoindex.rst

doc/source/adminguide/getting.started.rst

@@ -140,7 +140,6 @@ A sample configuration to test the system follows::
 
     --verbose
     --nodaemon
-    --FAKE_subdomain=ec2
     --auth_driver=nova.auth.dbdriver.DbDriver
 
 Running

doc/source/adminguide/multi.node.install.rst

@@ -92,7 +92,6 @@ Note: CC_ADDR=<the external IP address of your cloud controller>
 
 ::
 
-   --FAKE_subdomain=ec2             # workaround for ec2/euca api
    --fixed_range=<network/prefix>   # ip network to use for VM guests, ex 192.168.2.64/26
    --network_size=<# of addrs>      # number of ip addrs to use for VM guests, ex 64
 
@@ -104,19 +103,13 @@ Note: CC_ADDR=<the external IP address of your cloud controller>
    --fixed_range=<network/prefix>   # ip network to use for VM guests, ex 192.168.2.64/26
    --network_size=<# of addrs>      # number of ip addrs to use for VM guests, ex 64
 
-4. nova-api specific flags
-
-::
-
-   --FAKE_subdomain=ec2             # workaround for ec2/euca api
-
-5. Create a nova group
+4. Create a nova group
 
 ::
 
    sudo addgroup nova
 
-6. nova-objectstore specific flags < no specific config needed >
+5. nova-objectstore specific flags < no specific config needed >
 
 Config files should be have their owner set to root:nova, and mode set to 0640, since they contain your MySQL server's root password.
 

doc/source/adminguide/network.vlan.rst

@@ -31,7 +31,8 @@ In this mode, each project gets its own VLAN, Linux networking bridge, and subne
 
     In the VLAN network mode, all the VM instances of a project are connected together in a VLAN with the specified private subnet. Each running VM instance is assigned an IP address within the given private subnet. 
 
-.. todo:: Insert Figure 2 from "An OpenStack Network Overview" contributed by Citrix
+.. image:: /images/Novadiagram.png
+   :width: 790
    
 While network traffic between VM instances belonging to the same VLAN is always open, Nova can enforce isolation of network traffic between different projects by enforcing one VLAN per project. 
 

doc/source/adminguide/nova.manage.rst

@@ -27,37 +27,149 @@ administration and ongoing maintenance of nova, such as user creation,
 vpn management, and much more.
 
 The standard pattern for executing a nova-manage command is:
-
 ``nova-manage <category> <command> [<args>]``
 
 For example, to obtain a list of all projects:
+``nova-manage project list``
+
+Run without arguments to see a list of available command categories:
+``nova-manage``
+
+Categories are user, project, role, shell, vpn, and floating. Detailed descriptions are below.
+
+You can also run with a category argument such as user to see a list of all commands in that category:
+``nova-manage user``
+
+These sections describe the available categories and arguments for nova-manage.
+
+Nova User
+~~~~~~~~~
+
+``nova-manage user admin <username>``
+
+    Create an admin user with the name <username>.
+
+``nova-manage user create <username>``
+
+    Create a normal user with the name <username>.
+
+``nova-manage user delete <username>``
+
+    Delete the user with the name <username>.
+
+``nova-manage user exports <username>``
+
+    Outputs a list of access key and secret keys for user to the screen
+
+``nova-manage user list``
+
+    Outputs a list of all the user names to the screen.
+
+``nova-manage user modify <accesskey> <secretkey> <admin?T/F>``
+
+    Updates the indicated user keys, indicating with T or F if the user is an admin user. Leave any argument blank if you do not want to update it.
+	
+Nova Project
+~~~~~~~~~~~~
+
+``nova-manage project add <projectname>``
+
+    Add a nova project with the name <projectname> to the database.
+
+``nova-manage project create <projectname>``
+
+    Create a new nova project with the name <projectname> (you still need to do nova-manage project add <projectname> to add it to the database).
+	
+``nova-manage project delete <projectname>``
+
+    Delete a nova project with the name <projectname>.
+
+``nova-manage project environment <projectname> <username>``
+
+    Exports environment variables for the named project to a file named novarc.
     
 ``nova-manage project list``
 
-You can run without arguments to see a list of available command categories:
+    Outputs a list of all the projects to the screen.
 
-``nova-manage``
+``nova-manage project quota <projectname>``
 
-You can run with a category argument to see a list of all commands in that
-category:
+    Outputs the size and specs of the project's instances including gigabytes, instances, floating IPs, volumes, and cores.
 
-``nova-manage user``
+``nova-manage project remove <projectname>``
 
+    Deletes the project with the name <projectname>.
+
+``nova-manage project zipfile``
+
+    Compresses all related files for a created project into a zip file nova.zip.
+	
+Nova Role
+~~~~~~~~~
+
+nova-manage role <action> [<argument>] 
+``nova-manage role add <username> <rolename> <(optional) projectname>``
+
+    Add a user to either a global or project-based role with the indicated <rolename> assigned to the named user. Role names can be one of the following five roles: admin, itsec, projectmanager, netadmin, developer. If you add the project name as the last argument then the role is assigned just for that project, otherwise the user is assigned the named role for all projects. 
+
+``nova-manage role has <username> <projectname>``
+    Checks the user or project and responds with True if the user has a global role with a particular project.
+
+``nova-manage role remove <username> <rolename>``
+    Remove the indicated role from the user. 
 
 Nova Shell
 ~~~~~~~~~~
 
-* shell bpython
-    * start a new bpython shell
-* shell ipython
-    * start a new ipython shell
-* shell python
-    * start a new python shell
-* shell run
-    * ???
-* shell script: Runs the script from the specifed path with flags set properly.
-    * arguments: path
+``nova-manage shell bpython``
 
+    Starts a new bpython shell. 
+
+``nova-manage shell ipython``
+
+    Starts a new ipython shell.
+
+``nova-manage shell python``
+
+    Starts a new python shell.
+
+``nova-manage shell run``
+
+    Starts a new shell using python.
+
+``nova-manage shell script <path/scriptname>``
+
+    Runs the named script from the specified path with flags set.
+
+Nova VPN
+~~~~~~~~
+
+``nova-manage vpn list``
+
+    Displays a list of projects, their IP prot numbers, and what state they're in.
+
+``nova-manage vpn run <projectname>``
+
+    Starts the VPN for the named project.		
+
+``nova-manage vpn spawn``
+
+    Runs all VPNs.
+	
+Nova Floating IPs
+~~~~~~~~~~~~~~~~~
+
+``nova-manage floating create <host> <ip_range>``
+
+    Creates floating IP addresses for the named host by the given range.
+
+``nova-manage floating delete <ip_range>``
+
+    Deletes floating IP addresses in the range given.	
+	
+``nova-manage floating list``
+
+    Displays a list of all floating IP addresses.
 
 Concept: Flags
 --------------

doc/source/api/autoindex.rst

@@ -0,0 +1,99 @@
+.. 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

doc/source/api/nova..adminclient.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..adminclient` Module
+==============================================================================
+.. automodule:: nova..adminclient
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.cloud.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.cloud` Module
+==============================================================================
+.. automodule:: nova..api.cloud
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.ec2.admin.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.ec2.admin` Module
+==============================================================================
+.. automodule:: nova..api.ec2.admin
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.ec2.apirequest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.ec2.apirequest` Module
+==============================================================================
+.. automodule:: nova..api.ec2.apirequest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.ec2.cloud.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.ec2.cloud` Module
+==============================================================================
+.. automodule:: nova..api.ec2.cloud
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.ec2.images.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.ec2.images` Module
+==============================================================================
+.. automodule:: nova..api.ec2.images
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.ec2.metadatarequesthandler.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.ec2.metadatarequesthandler` Module
+==============================================================================
+.. automodule:: nova..api.ec2.metadatarequesthandler
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.auth.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.auth` Module
+==============================================================================
+.. automodule:: nova..api.openstack.auth
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.backup_schedules.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.backup_schedules` Module
+==============================================================================
+.. automodule:: nova..api.openstack.backup_schedules
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.faults.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.faults` Module
+==============================================================================
+.. automodule:: nova..api.openstack.faults
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.flavors.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.flavors` Module
+==============================================================================
+.. automodule:: nova..api.openstack.flavors
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.images.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.images` Module
+==============================================================================
+.. automodule:: nova..api.openstack.images
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.servers.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.servers` Module
+==============================================================================
+.. automodule:: nova..api.openstack.servers
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..api.openstack.sharedipgroups.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..api.openstack.sharedipgroups` Module
+==============================================================================
+.. automodule:: nova..api.openstack.sharedipgroups
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..auth.dbdriver.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..auth.dbdriver` Module
+==============================================================================
+.. automodule:: nova..auth.dbdriver
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..auth.fakeldap.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..auth.fakeldap` Module
+==============================================================================
+.. automodule:: nova..auth.fakeldap
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..auth.ldapdriver.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..auth.ldapdriver` Module
+==============================================================================
+.. automodule:: nova..auth.ldapdriver
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..auth.manager.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..auth.manager` Module
+==============================================================================
+.. automodule:: nova..auth.manager
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..auth.signer.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..auth.signer` Module
+==============================================================================
+.. automodule:: nova..auth.signer
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..cloudpipe.pipelib.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..cloudpipe.pipelib` Module
+==============================================================================
+.. automodule:: nova..cloudpipe.pipelib
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..compute.disk.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..compute.disk` Module
+==============================================================================
+.. automodule:: nova..compute.disk
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..compute.instance_types.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..compute.instance_types` Module
+==============================================================================
+.. automodule:: nova..compute.instance_types
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..compute.manager.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..compute.manager` Module
+==============================================================================
+.. automodule:: nova..compute.manager
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..compute.monitor.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..compute.monitor` Module
+==============================================================================
+.. automodule:: nova..compute.monitor
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..compute.power_state.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..compute.power_state` Module
+==============================================================================
+.. automodule:: nova..compute.power_state
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..context.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..context` Module
+==============================================================================
+.. automodule:: nova..context
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..crypto.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..crypto` Module
+==============================================================================
+.. automodule:: nova..crypto
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..db.api.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..db.api` Module
+==============================================================================
+.. automodule:: nova..db.api
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..db.sqlalchemy.api.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..db.sqlalchemy.api` Module
+==============================================================================
+.. automodule:: nova..db.sqlalchemy.api
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..db.sqlalchemy.models.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..db.sqlalchemy.models` Module
+==============================================================================
+.. automodule:: nova..db.sqlalchemy.models
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..db.sqlalchemy.session.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..db.sqlalchemy.session` Module
+==============================================================================
+.. automodule:: nova..db.sqlalchemy.session
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..exception.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..exception` Module
+==============================================================================
+.. automodule:: nova..exception
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..fakerabbit.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..fakerabbit` Module
+==============================================================================
+.. automodule:: nova..fakerabbit
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..flags.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..flags` Module
+==============================================================================
+.. automodule:: nova..flags
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..image.service.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..image.service` Module
+==============================================================================
+.. automodule:: nova..image.service
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..manager.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..manager` Module
+==============================================================================
+.. automodule:: nova..manager
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..network.linux_net.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..network.linux_net` Module
+==============================================================================
+.. automodule:: nova..network.linux_net
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..network.manager.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..network.manager` Module
+==============================================================================
+.. automodule:: nova..network.manager
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..objectstore.bucket.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..objectstore.bucket` Module
+==============================================================================
+.. automodule:: nova..objectstore.bucket
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..objectstore.handler.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..objectstore.handler` Module
+==============================================================================
+.. automodule:: nova..objectstore.handler
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..objectstore.image.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..objectstore.image` Module
+==============================================================================
+.. automodule:: nova..objectstore.image
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..objectstore.stored.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..objectstore.stored` Module
+==============================================================================
+.. automodule:: nova..objectstore.stored
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..process.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..process` Module
+==============================================================================
+.. automodule:: nova..process
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..quota.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..quota` Module
+==============================================================================
+.. automodule:: nova..quota
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..rpc.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..rpc` Module
+==============================================================================
+.. automodule:: nova..rpc
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..scheduler.chance.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..scheduler.chance` Module
+==============================================================================
+.. automodule:: nova..scheduler.chance
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..scheduler.driver.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..scheduler.driver` Module
+==============================================================================
+.. automodule:: nova..scheduler.driver
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..scheduler.manager.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..scheduler.manager` Module
+==============================================================================
+.. automodule:: nova..scheduler.manager
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..scheduler.simple.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..scheduler.simple` Module
+==============================================================================
+.. automodule:: nova..scheduler.simple
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..server.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..server` Module
+==============================================================================
+.. automodule:: nova..server
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..service.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..service` Module
+==============================================================================
+.. automodule:: nova..service
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..test.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..test` Module
+==============================================================================
+.. automodule:: nova..test
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.access_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.access_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.access_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.fakes.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.fakes` Module
+==============================================================================
+.. automodule:: nova..tests.api.fakes
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.fakes.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.fakes` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.fakes
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_api.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_api` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_api
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_auth.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_auth` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_auth
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_faults.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_faults` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_faults
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_flavors.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_flavors` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_flavors
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_images.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_images` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_images
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_ratelimiting.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_ratelimiting` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_ratelimiting
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_servers.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_servers` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_servers
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.openstack.test_sharedipgroups.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.openstack.test_sharedipgroups` Module
+==============================================================================
+.. automodule:: nova..tests.api.openstack.test_sharedipgroups
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api.test_wsgi.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api.test_wsgi` Module
+==============================================================================
+.. automodule:: nova..tests.api.test_wsgi
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api_integration.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api_integration` Module
+==============================================================================
+.. automodule:: nova..tests.api_integration
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.api_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.api_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.api_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.auth_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.auth_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.auth_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.cloud_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.cloud_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.cloud_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.compute_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.compute_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.compute_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.declare_flags.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.declare_flags` Module
+==============================================================================
+.. automodule:: nova..tests.declare_flags
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.fake_flags.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.fake_flags` Module
+==============================================================================
+.. automodule:: nova..tests.fake_flags
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.flags_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.flags_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.flags_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.network_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.network_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.network_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.objectstore_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.objectstore_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.objectstore_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.process_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.process_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.process_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.quota_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.quota_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.quota_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.real_flags.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.real_flags` Module
+==============================================================================
+.. automodule:: nova..tests.real_flags
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.rpc_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.rpc_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.rpc_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.runtime_flags.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.runtime_flags` Module
+==============================================================================
+.. automodule:: nova..tests.runtime_flags
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.scheduler_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.scheduler_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.scheduler_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.service_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.service_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.service_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.twistd_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.twistd_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.twistd_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.validator_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.validator_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.validator_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.virt_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.virt_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.virt_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..tests.volume_unittest.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..tests.volume_unittest` Module
+==============================================================================
+.. automodule:: nova..tests.volume_unittest
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..twistd.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..twistd` Module
+==============================================================================
+.. automodule:: nova..twistd
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..utils.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..utils` Module
+==============================================================================
+.. automodule:: nova..utils
+  :members:
+  :undoc-members:
+  :show-inheritance:

doc/source/api/nova..validate.rst

@@ -0,0 +1,6 @@
+The :mod:`nova..validate` Module
+==============================================================================
+.. automodule:: nova..validate
+  :members:
+  :undoc-members:
+  :show-inheritance: