Changed from fine-grained operation control to binary admin on/off setting.

166 files changed, 280 insertions, 34 deletions

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..2a6eb8d7d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,29 @@
+# Format is:
+# <preferred e-mail> <other e-mail>
+<code@term.ie> <github@anarkystic.com>
+<code@term.ie> <termie@preciousroy.local>
+<Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
+<matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
+<matt.dietz@rackspace.com> <mdietz@openstack>
+<cbehrens@codestud.com> <chris.behrens@rackspace.com>
+<devin.carlen@gmail.com> <devcamcar@illian.local>
+<ewan.mellor@citrix.com> <emellor@silver>
+<jaypipes@gmail.com> <jpipes@serialcoder>
+<anotherjesse@gmail.com> <jesse@dancelamb>
+<anotherjesse@gmail.com> <jesse@gigantor.local>
+<anotherjesse@gmail.com> <jesse@ubuntu>
+<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
+<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
+<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
+<justin@fathomdb.com> <justinsb@justinsb-desktop>
+<mordred@inaugust.com> <mordred@hudson>
+<paul@openstack.org> <pvoccio@castor.local>
+<paul@openstack.org> <paul.voccio@rackspace.com>
+<todd@ansolabs.com> <todd@lapex>
+<todd@ansolabs.com> <todd@rubidine.com>
+<vishvananda@gmail.com> <vishvananda@yahoo.com>
+<vishvananda@gmail.com> <root@mirror.nasanebula.net>
+# These are from people who failed to set a proper committer
+. <root@tonbuntu>
+. <laner@controller>
+. <root@ubuntu>
diff --git a/Authors b/Authors
index ec3a1cbd8..ef1a535ca 100644
--- a/Authors
+++ b/Authors
@@ -1,6 +1,9 @@
 Andy Smith <code@term.ie>
 Anne Gentle <anne@openstack.org>
+Anthony Young <sleepsonthefloor@gmail.com>
+Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
 Chris Behrens <cbehrens@codestud.com>
+Dean Troyer <dtroyer@gmail.com>
 Devin Carlen <devin.carlen@gmail.com>
 Eric Day <eday@oddments.org>
 Ewan Mellor <ewan.mellor@citrix.com>
@@ -8,7 +11,8 @@ Hisaki Ohara <hisaki.ohara@intel.com>
 Jay Pipes <jaypipes@gmail.com>
 Jesse Andrews <anotherjesse@gmail.com>
 Joe Heck <heckj@mac.com>
-Joel Moore joelbm24@gmail.com
+Joel Moore <joelbm24@gmail.com>
+Josh Kearney <josh.kearney@rackspace.com>
 Joshua McKenty <jmckenty@gmail.com>
 Justin Santa Barbara <justin@fathomdb.com>
 Matt Dietz <matt.dietz@rackspace.com>
@@ -19,3 +23,5 @@ Rick Clark <rick@openstack.org>
 Soren Hansen <soren.hansen@rackspace.com>
 Todd Willey <todd@ansolabs.com>
 Vishvananda Ishaya <vishvananda@gmail.com>
+Youcef Laribi <Youcef.Laribi@eu.citrix.com>
+Zhixue Wu <Zhixue.Wu@citrix.com>
diff --git a/contrib/nova.sh b/contrib/nova.sh
index 9bc36d6fb..f47d972ab 100755
--- a/contrib/nova.sh
+++ b/contrib/nova.sh
@@ -40,7 +40,6 @@ cat >/etc/nova/nova-manage.conf << NOVA_CONF_EOF
 --verbose
 --nodaemon
 --dhcpbridge_flagfile=/etc/nova/nova-manage.conf
---FAKE_subdomain=ec2
 --cc_host=$HOST_IP
 --routing_source_ip=$HOST_IP
 --sql_connection=$SQL_CONN
diff --git a/contrib/puppet/templates/production/nova-common.conf.erb b/contrib/puppet/templates/production/nova-common.conf.erb
index 00c110781..23ee0c5e8 100644
--- a/contrib/puppet/templates/production/nova-common.conf.erb
+++ b/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
diff --git a/doc/build/doctrees/adminguide/binaries.doctree b/doc/build/doctrees/adminguide/binaries.doctree
deleted file mode 100644
index 8006245a9..000000000
--- a/doc/build/doctrees/adminguide/binaries.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/distros/others.doctree b/doc/build/doctrees/adminguide/distros/others.doctree
deleted file mode 100644
index c7f14fb91..000000000
--- a/doc/build/doctrees/adminguide/distros/others.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/distros/ubuntu.10.04.doctree b/doc/build/doctrees/adminguide/distros/ubuntu.10.04.doctree
deleted file mode 100644
index 135763bf7..000000000
--- a/doc/build/doctrees/adminguide/distros/ubuntu.10.04.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/distros/ubuntu.10.10.doctree b/doc/build/doctrees/adminguide/distros/ubuntu.10.10.doctree
deleted file mode 100644
index 2005aa78c..000000000
--- a/doc/build/doctrees/adminguide/distros/ubuntu.10.10.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/euca2ools.doctree b/doc/build/doctrees/adminguide/euca2ools.doctree
deleted file mode 100644
index 390845265..000000000
--- a/doc/build/doctrees/adminguide/euca2ools.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/flags.doctree b/doc/build/doctrees/adminguide/flags.doctree
deleted file mode 100644
index 0fd0522b8..000000000
--- a/doc/build/doctrees/adminguide/flags.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/getting.started.doctree b/doc/build/doctrees/adminguide/getting.started.doctree
deleted file mode 100644
index a4d1fce7a..000000000
--- a/doc/build/doctrees/adminguide/getting.started.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/index.doctree b/doc/build/doctrees/adminguide/index.doctree
deleted file mode 100644
index 43791ff9d..000000000
--- a/doc/build/doctrees/adminguide/index.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/managing.images.doctree b/doc/build/doctrees/adminguide/managing.images.doctree
deleted file mode 100644
index 764bc8ace..000000000
--- a/doc/build/doctrees/adminguide/managing.images.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/managing.instances.doctree b/doc/build/doctrees/adminguide/managing.instances.doctree
deleted file mode 100644
index 3bd9917de..000000000
--- a/doc/build/doctrees/adminguide/managing.instances.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/managing.networks.doctree b/doc/build/doctrees/adminguide/managing.networks.doctree
deleted file mode 100644
index e34f6ae28..000000000
--- a/doc/build/doctrees/adminguide/managing.networks.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/managing.projects.doctree b/doc/build/doctrees/adminguide/managing.projects.doctree
deleted file mode 100644
index 041c1dd61..000000000
--- a/doc/build/doctrees/adminguide/managing.projects.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/managing.users.doctree b/doc/build/doctrees/adminguide/managing.users.doctree
deleted file mode 100644
index c21f05487..000000000
--- a/doc/build/doctrees/adminguide/managing.users.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/managingsecurity.doctree b/doc/build/doctrees/adminguide/managingsecurity.doctree
deleted file mode 100644
index 8d5a35097..000000000
--- a/doc/build/doctrees/adminguide/managingsecurity.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/monitoring.doctree b/doc/build/doctrees/adminguide/monitoring.doctree
deleted file mode 100644
index c0c83f29a..000000000
--- a/doc/build/doctrees/adminguide/monitoring.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/multi.node.install.doctree b/doc/build/doctrees/adminguide/multi.node.install.doctree
deleted file mode 100644
index 0b24939e6..000000000
--- a/doc/build/doctrees/adminguide/multi.node.install.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/network.flat.doctree b/doc/build/doctrees/adminguide/network.flat.doctree
deleted file mode 100644
index 99b60132e..000000000
--- a/doc/build/doctrees/adminguide/network.flat.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/network.vlan.doctree b/doc/build/doctrees/adminguide/network.vlan.doctree
deleted file mode 100644
index 02e6e7ef1..000000000
--- a/doc/build/doctrees/adminguide/network.vlan.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/nova.manage.doctree b/doc/build/doctrees/adminguide/nova.manage.doctree
deleted file mode 100644
index b06b1fc48..000000000
--- a/doc/build/doctrees/adminguide/nova.manage.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/adminguide/single.node.install.doctree b/doc/build/doctrees/adminguide/single.node.install.doctree
deleted file mode 100644
index a0a0c9271..000000000
--- a/doc/build/doctrees/adminguide/single.node.install.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/autoindex.doctree b/doc/build/doctrees/api/autoindex.doctree
deleted file mode 100644
index ca690eeab..000000000
--- a/doc/build/doctrees/api/autoindex.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..adminclient.doctree b/doc/build/doctrees/api/nova..adminclient.doctree
deleted file mode 100644
index 5fc153196..000000000
--- a/doc/build/doctrees/api/nova..adminclient.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.cloud.doctree b/doc/build/doctrees/api/nova..api.cloud.doctree
deleted file mode 100644
index 21d8011be..000000000
--- a/doc/build/doctrees/api/nova..api.cloud.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.ec2.admin.doctree b/doc/build/doctrees/api/nova..api.ec2.admin.doctree
deleted file mode 100644
index 3fec631a4..000000000
--- a/doc/build/doctrees/api/nova..api.ec2.admin.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.ec2.apirequest.doctree b/doc/build/doctrees/api/nova..api.ec2.apirequest.doctree
deleted file mode 100644
index b212d15a7..000000000
--- a/doc/build/doctrees/api/nova..api.ec2.apirequest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.ec2.cloud.doctree b/doc/build/doctrees/api/nova..api.ec2.cloud.doctree
deleted file mode 100644
index 16d7ad90a..000000000
--- a/doc/build/doctrees/api/nova..api.ec2.cloud.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.ec2.images.doctree b/doc/build/doctrees/api/nova..api.ec2.images.doctree
deleted file mode 100644
index 340a4bc04..000000000
--- a/doc/build/doctrees/api/nova..api.ec2.images.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.ec2.metadatarequesthandler.doctree b/doc/build/doctrees/api/nova..api.ec2.metadatarequesthandler.doctree
deleted file mode 100644
index c1da3eaf9..000000000
--- a/doc/build/doctrees/api/nova..api.ec2.metadatarequesthandler.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.auth.doctree b/doc/build/doctrees/api/nova..api.openstack.auth.doctree
deleted file mode 100644
index b5e4e32ae..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.auth.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.backup_schedules.doctree b/doc/build/doctrees/api/nova..api.openstack.backup_schedules.doctree
deleted file mode 100644
index 3e063ce80..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.backup_schedules.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.faults.doctree b/doc/build/doctrees/api/nova..api.openstack.faults.doctree
deleted file mode 100644
index e2c149b4b..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.faults.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.flavors.doctree b/doc/build/doctrees/api/nova..api.openstack.flavors.doctree
deleted file mode 100644
index 0df3200c1..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.flavors.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.images.doctree b/doc/build/doctrees/api/nova..api.openstack.images.doctree
deleted file mode 100644
index e2f83944b..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.images.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.servers.doctree b/doc/build/doctrees/api/nova..api.openstack.servers.doctree
deleted file mode 100644
index 64bf16c45..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.servers.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..api.openstack.sharedipgroups.doctree b/doc/build/doctrees/api/nova..api.openstack.sharedipgroups.doctree
deleted file mode 100644
index 144e9472b..000000000
--- a/doc/build/doctrees/api/nova..api.openstack.sharedipgroups.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..auth.dbdriver.doctree b/doc/build/doctrees/api/nova..auth.dbdriver.doctree
deleted file mode 100644
index 6fdcc725e..000000000
--- a/doc/build/doctrees/api/nova..auth.dbdriver.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..auth.fakeldap.doctree b/doc/build/doctrees/api/nova..auth.fakeldap.doctree
deleted file mode 100644
index 2723a22ff..000000000
--- a/doc/build/doctrees/api/nova..auth.fakeldap.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..auth.ldapdriver.doctree b/doc/build/doctrees/api/nova..auth.ldapdriver.doctree
deleted file mode 100644
index 1698a7a67..000000000
--- a/doc/build/doctrees/api/nova..auth.ldapdriver.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..auth.manager.doctree b/doc/build/doctrees/api/nova..auth.manager.doctree
deleted file mode 100644
index e323006e1..000000000
--- a/doc/build/doctrees/api/nova..auth.manager.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..auth.signer.doctree b/doc/build/doctrees/api/nova..auth.signer.doctree
deleted file mode 100644
index fe4dd3f67..000000000
--- a/doc/build/doctrees/api/nova..auth.signer.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..cloudpipe.pipelib.doctree b/doc/build/doctrees/api/nova..cloudpipe.pipelib.doctree
deleted file mode 100644
index 5027c13bb..000000000
--- a/doc/build/doctrees/api/nova..cloudpipe.pipelib.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..compute.disk.doctree b/doc/build/doctrees/api/nova..compute.disk.doctree
deleted file mode 100644
index ac3a5478e..000000000
--- a/doc/build/doctrees/api/nova..compute.disk.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..compute.instance_types.doctree b/doc/build/doctrees/api/nova..compute.instance_types.doctree
deleted file mode 100644
index 2a7c03553..000000000
--- a/doc/build/doctrees/api/nova..compute.instance_types.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..compute.manager.doctree b/doc/build/doctrees/api/nova..compute.manager.doctree
deleted file mode 100644
index bc7446484..000000000
--- a/doc/build/doctrees/api/nova..compute.manager.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..compute.monitor.doctree b/doc/build/doctrees/api/nova..compute.monitor.doctree
deleted file mode 100644
index 34cad0354..000000000
--- a/doc/build/doctrees/api/nova..compute.monitor.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..compute.power_state.doctree b/doc/build/doctrees/api/nova..compute.power_state.doctree
deleted file mode 100644
index b2424de7b..000000000
--- a/doc/build/doctrees/api/nova..compute.power_state.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..context.doctree b/doc/build/doctrees/api/nova..context.doctree
deleted file mode 100644
index b8352dfd5..000000000
--- a/doc/build/doctrees/api/nova..context.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..crypto.doctree b/doc/build/doctrees/api/nova..crypto.doctree
deleted file mode 100644
index e40b776f1..000000000
--- a/doc/build/doctrees/api/nova..crypto.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..db.api.doctree b/doc/build/doctrees/api/nova..db.api.doctree
deleted file mode 100644
index e8ffeed71..000000000
--- a/doc/build/doctrees/api/nova..db.api.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..db.sqlalchemy.api.doctree b/doc/build/doctrees/api/nova..db.sqlalchemy.api.doctree
deleted file mode 100644
index a67a57d41..000000000
--- a/doc/build/doctrees/api/nova..db.sqlalchemy.api.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..db.sqlalchemy.models.doctree b/doc/build/doctrees/api/nova..db.sqlalchemy.models.doctree
deleted file mode 100644
index 42a1e51fe..000000000
--- a/doc/build/doctrees/api/nova..db.sqlalchemy.models.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..db.sqlalchemy.session.doctree b/doc/build/doctrees/api/nova..db.sqlalchemy.session.doctree
deleted file mode 100644
index 1253924b5..000000000
--- a/doc/build/doctrees/api/nova..db.sqlalchemy.session.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..exception.doctree b/doc/build/doctrees/api/nova..exception.doctree
deleted file mode 100644
index 53f4b6889..000000000
--- a/doc/build/doctrees/api/nova..exception.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..fakerabbit.doctree b/doc/build/doctrees/api/nova..fakerabbit.doctree
deleted file mode 100644
index b63c50cd8..000000000
--- a/doc/build/doctrees/api/nova..fakerabbit.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..flags.doctree b/doc/build/doctrees/api/nova..flags.doctree
deleted file mode 100644
index ca1115625..000000000
--- a/doc/build/doctrees/api/nova..flags.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..image.service.doctree b/doc/build/doctrees/api/nova..image.service.doctree
deleted file mode 100644
index 9798631ae..000000000
--- a/doc/build/doctrees/api/nova..image.service.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..manager.doctree b/doc/build/doctrees/api/nova..manager.doctree
deleted file mode 100644
index 59c20c56c..000000000
--- a/doc/build/doctrees/api/nova..manager.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..network.linux_net.doctree b/doc/build/doctrees/api/nova..network.linux_net.doctree
deleted file mode 100644
index 850b1fe46..000000000
--- a/doc/build/doctrees/api/nova..network.linux_net.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..network.manager.doctree b/doc/build/doctrees/api/nova..network.manager.doctree
deleted file mode 100644
index 5a17fa2a6..000000000
--- a/doc/build/doctrees/api/nova..network.manager.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..objectstore.bucket.doctree b/doc/build/doctrees/api/nova..objectstore.bucket.doctree
deleted file mode 100644
index c4c5cfa86..000000000
--- a/doc/build/doctrees/api/nova..objectstore.bucket.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..objectstore.handler.doctree b/doc/build/doctrees/api/nova..objectstore.handler.doctree
deleted file mode 100644
index dd22550ad..000000000
--- a/doc/build/doctrees/api/nova..objectstore.handler.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..objectstore.image.doctree b/doc/build/doctrees/api/nova..objectstore.image.doctree
deleted file mode 100644
index 89e80c8b7..000000000
--- a/doc/build/doctrees/api/nova..objectstore.image.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..objectstore.stored.doctree b/doc/build/doctrees/api/nova..objectstore.stored.doctree
deleted file mode 100644
index 37eb82db0..000000000
--- a/doc/build/doctrees/api/nova..objectstore.stored.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..process.doctree b/doc/build/doctrees/api/nova..process.doctree
deleted file mode 100644
index ca306d07e..000000000
--- a/doc/build/doctrees/api/nova..process.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..quota.doctree b/doc/build/doctrees/api/nova..quota.doctree
deleted file mode 100644
index ea7e87026..000000000
--- a/doc/build/doctrees/api/nova..quota.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..rpc.doctree b/doc/build/doctrees/api/nova..rpc.doctree
deleted file mode 100644
index d774f13ac..000000000
--- a/doc/build/doctrees/api/nova..rpc.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..scheduler.chance.doctree b/doc/build/doctrees/api/nova..scheduler.chance.doctree
deleted file mode 100644
index 0d65dbd82..000000000
--- a/doc/build/doctrees/api/nova..scheduler.chance.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..scheduler.driver.doctree b/doc/build/doctrees/api/nova..scheduler.driver.doctree
deleted file mode 100644
index cdd709e09..000000000
--- a/doc/build/doctrees/api/nova..scheduler.driver.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..scheduler.manager.doctree b/doc/build/doctrees/api/nova..scheduler.manager.doctree
deleted file mode 100644
index 04d6d7a02..000000000
--- a/doc/build/doctrees/api/nova..scheduler.manager.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..scheduler.simple.doctree b/doc/build/doctrees/api/nova..scheduler.simple.doctree
deleted file mode 100644
index 0831a51dc..000000000
--- a/doc/build/doctrees/api/nova..scheduler.simple.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..server.doctree b/doc/build/doctrees/api/nova..server.doctree
deleted file mode 100644
index 3afb0e8ec..000000000
--- a/doc/build/doctrees/api/nova..server.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..service.doctree b/doc/build/doctrees/api/nova..service.doctree
deleted file mode 100644
index 7f7ae945f..000000000
--- a/doc/build/doctrees/api/nova..service.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..test.doctree b/doc/build/doctrees/api/nova..test.doctree
deleted file mode 100644
index 4c387d9a6..000000000
--- a/doc/build/doctrees/api/nova..test.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.access_unittest.doctree b/doc/build/doctrees/api/nova..tests.access_unittest.doctree
deleted file mode 100644
index 62425af2b..000000000
--- a/doc/build/doctrees/api/nova..tests.access_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.fakes.doctree b/doc/build/doctrees/api/nova..tests.api.fakes.doctree
deleted file mode 100644
index dda086c3e..000000000
--- a/doc/build/doctrees/api/nova..tests.api.fakes.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.fakes.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.fakes.doctree
deleted file mode 100644
index 326af55b7..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.fakes.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_api.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_api.doctree
deleted file mode 100644
index 16f344192..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_api.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_auth.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_auth.doctree
deleted file mode 100644
index 7fccdda3d..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_auth.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_faults.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_faults.doctree
deleted file mode 100644
index 6b82c60b2..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_faults.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_flavors.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_flavors.doctree
deleted file mode 100644
index 7339f03fc..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_flavors.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_images.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_images.doctree
deleted file mode 100644
index 30849418b..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_images.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_ratelimiting.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_ratelimiting.doctree
deleted file mode 100644
index ba40cd2f0..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_ratelimiting.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_servers.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_servers.doctree
deleted file mode 100644
index 37017584f..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_servers.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.openstack.test_sharedipgroups.doctree b/doc/build/doctrees/api/nova..tests.api.openstack.test_sharedipgroups.doctree
deleted file mode 100644
index 6febac045..000000000
--- a/doc/build/doctrees/api/nova..tests.api.openstack.test_sharedipgroups.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api.test_wsgi.doctree b/doc/build/doctrees/api/nova..tests.api.test_wsgi.doctree
deleted file mode 100644
index f4fc78f11..000000000
--- a/doc/build/doctrees/api/nova..tests.api.test_wsgi.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api_integration.doctree b/doc/build/doctrees/api/nova..tests.api_integration.doctree
deleted file mode 100644
index 1a85b2439..000000000
--- a/doc/build/doctrees/api/nova..tests.api_integration.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.api_unittest.doctree b/doc/build/doctrees/api/nova..tests.api_unittest.doctree
deleted file mode 100644
index de15e69c2..000000000
--- a/doc/build/doctrees/api/nova..tests.api_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.auth_unittest.doctree b/doc/build/doctrees/api/nova..tests.auth_unittest.doctree
deleted file mode 100644
index 262beefbc..000000000
--- a/doc/build/doctrees/api/nova..tests.auth_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.cloud_unittest.doctree b/doc/build/doctrees/api/nova..tests.cloud_unittest.doctree
deleted file mode 100644
index 69bbe7456..000000000
--- a/doc/build/doctrees/api/nova..tests.cloud_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.compute_unittest.doctree b/doc/build/doctrees/api/nova..tests.compute_unittest.doctree
deleted file mode 100644
index 71874bbe8..000000000
--- a/doc/build/doctrees/api/nova..tests.compute_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.declare_flags.doctree b/doc/build/doctrees/api/nova..tests.declare_flags.doctree
deleted file mode 100644
index 33d1e29d8..000000000
--- a/doc/build/doctrees/api/nova..tests.declare_flags.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.fake_flags.doctree b/doc/build/doctrees/api/nova..tests.fake_flags.doctree
deleted file mode 100644
index cc925c70e..000000000
--- a/doc/build/doctrees/api/nova..tests.fake_flags.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.flags_unittest.doctree b/doc/build/doctrees/api/nova..tests.flags_unittest.doctree
deleted file mode 100644
index d53aa0854..000000000
--- a/doc/build/doctrees/api/nova..tests.flags_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.network_unittest.doctree b/doc/build/doctrees/api/nova..tests.network_unittest.doctree
deleted file mode 100644
index 721e3eb5e..000000000
--- a/doc/build/doctrees/api/nova..tests.network_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.objectstore_unittest.doctree b/doc/build/doctrees/api/nova..tests.objectstore_unittest.doctree
deleted file mode 100644
index a012c0699..000000000
--- a/doc/build/doctrees/api/nova..tests.objectstore_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.process_unittest.doctree b/doc/build/doctrees/api/nova..tests.process_unittest.doctree
deleted file mode 100644
index 284e15b3d..000000000
--- a/doc/build/doctrees/api/nova..tests.process_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.quota_unittest.doctree b/doc/build/doctrees/api/nova..tests.quota_unittest.doctree
deleted file mode 100644
index cd2dc5588..000000000
--- a/doc/build/doctrees/api/nova..tests.quota_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.real_flags.doctree b/doc/build/doctrees/api/nova..tests.real_flags.doctree
deleted file mode 100644
index 9f338dfe8..000000000
--- a/doc/build/doctrees/api/nova..tests.real_flags.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.rpc_unittest.doctree b/doc/build/doctrees/api/nova..tests.rpc_unittest.doctree
deleted file mode 100644
index 9499865f1..000000000
--- a/doc/build/doctrees/api/nova..tests.rpc_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.runtime_flags.doctree b/doc/build/doctrees/api/nova..tests.runtime_flags.doctree
deleted file mode 100644
index a652947c3..000000000
--- a/doc/build/doctrees/api/nova..tests.runtime_flags.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.scheduler_unittest.doctree b/doc/build/doctrees/api/nova..tests.scheduler_unittest.doctree
deleted file mode 100644
index 22ff4eaf5..000000000
--- a/doc/build/doctrees/api/nova..tests.scheduler_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.service_unittest.doctree b/doc/build/doctrees/api/nova..tests.service_unittest.doctree
deleted file mode 100644
index c5a225518..000000000
--- a/doc/build/doctrees/api/nova..tests.service_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.twistd_unittest.doctree b/doc/build/doctrees/api/nova..tests.twistd_unittest.doctree
deleted file mode 100644
index a52f8dcf3..000000000
--- a/doc/build/doctrees/api/nova..tests.twistd_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.validator_unittest.doctree b/doc/build/doctrees/api/nova..tests.validator_unittest.doctree
deleted file mode 100644
index d81dde843..000000000
--- a/doc/build/doctrees/api/nova..tests.validator_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.virt_unittest.doctree b/doc/build/doctrees/api/nova..tests.virt_unittest.doctree
deleted file mode 100644
index 62b642b63..000000000
--- a/doc/build/doctrees/api/nova..tests.virt_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..tests.volume_unittest.doctree b/doc/build/doctrees/api/nova..tests.volume_unittest.doctree
deleted file mode 100644
index c99f33eb8..000000000
--- a/doc/build/doctrees/api/nova..tests.volume_unittest.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..twistd.doctree b/doc/build/doctrees/api/nova..twistd.doctree
deleted file mode 100644
index 893f4864b..000000000
--- a/doc/build/doctrees/api/nova..twistd.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..utils.doctree b/doc/build/doctrees/api/nova..utils.doctree
deleted file mode 100644
index 4c164066c..000000000
--- a/doc/build/doctrees/api/nova..utils.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..validate.doctree b/doc/build/doctrees/api/nova..validate.doctree
deleted file mode 100644
index 3098bc6fd..000000000
--- a/doc/build/doctrees/api/nova..validate.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..virt.connection.doctree b/doc/build/doctrees/api/nova..virt.connection.doctree
deleted file mode 100644
index ea4dbaba1..000000000
--- a/doc/build/doctrees/api/nova..virt.connection.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..virt.fake.doctree b/doc/build/doctrees/api/nova..virt.fake.doctree
deleted file mode 100644
index a028d10ec..000000000
--- a/doc/build/doctrees/api/nova..virt.fake.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..virt.images.doctree b/doc/build/doctrees/api/nova..virt.images.doctree
deleted file mode 100644
index db2353d42..000000000
--- a/doc/build/doctrees/api/nova..virt.images.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..virt.libvirt_conn.doctree b/doc/build/doctrees/api/nova..virt.libvirt_conn.doctree
deleted file mode 100644
index 3ae5410cb..000000000
--- a/doc/build/doctrees/api/nova..virt.libvirt_conn.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..virt.xenapi.doctree b/doc/build/doctrees/api/nova..virt.xenapi.doctree
deleted file mode 100644
index 5173a3338..000000000
--- a/doc/build/doctrees/api/nova..virt.xenapi.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..volume.driver.doctree b/doc/build/doctrees/api/nova..volume.driver.doctree
deleted file mode 100644
index a31cf96c0..000000000
--- a/doc/build/doctrees/api/nova..volume.driver.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..volume.manager.doctree b/doc/build/doctrees/api/nova..volume.manager.doctree
deleted file mode 100644
index dceea1808..000000000
--- a/doc/build/doctrees/api/nova..volume.manager.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/api/nova..wsgi.doctree b/doc/build/doctrees/api/nova..wsgi.doctree
deleted file mode 100644
index 1b5467242..000000000
--- a/doc/build/doctrees/api/nova..wsgi.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/cloud101.doctree b/doc/build/doctrees/cloud101.doctree
deleted file mode 100644
index e7667f866..000000000
--- a/doc/build/doctrees/cloud101.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/code.doctree b/doc/build/doctrees/code.doctree
deleted file mode 100644
index ce5ad4485..000000000
--- a/doc/build/doctrees/code.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/community.doctree b/doc/build/doctrees/community.doctree
deleted file mode 100644
index 6837addb6..000000000
--- a/doc/build/doctrees/community.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/api.doctree b/doc/build/doctrees/devref/api.doctree
deleted file mode 100644
index 8151a68da..000000000
--- a/doc/build/doctrees/devref/api.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/architecture.doctree b/doc/build/doctrees/devref/architecture.doctree
deleted file mode 100644
index b5de0bc69..000000000
--- a/doc/build/doctrees/devref/architecture.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/auth.doctree b/doc/build/doctrees/devref/auth.doctree
deleted file mode 100644
index 97d880a5e..000000000
--- a/doc/build/doctrees/devref/auth.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/cloudpipe.doctree b/doc/build/doctrees/devref/cloudpipe.doctree
deleted file mode 100644
index d7f9a48a4..000000000
--- a/doc/build/doctrees/devref/cloudpipe.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/compute.doctree b/doc/build/doctrees/devref/compute.doctree
deleted file mode 100644
index d74e49f5a..000000000
--- a/doc/build/doctrees/devref/compute.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/database.doctree b/doc/build/doctrees/devref/database.doctree
deleted file mode 100644
index 7c57de72a..000000000
--- a/doc/build/doctrees/devref/database.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/development.environment.doctree b/doc/build/doctrees/devref/development.environment.doctree
deleted file mode 100644
index 4862bd192..000000000
--- a/doc/build/doctrees/devref/development.environment.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/fakes.doctree b/doc/build/doctrees/devref/fakes.doctree
deleted file mode 100644
index 8c07eced6..000000000
--- a/doc/build/doctrees/devref/fakes.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/glance.doctree b/doc/build/doctrees/devref/glance.doctree
deleted file mode 100644
index 124d77771..000000000
--- a/doc/build/doctrees/devref/glance.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/index.doctree b/doc/build/doctrees/devref/index.doctree
deleted file mode 100644
index 8c155355e..000000000
--- a/doc/build/doctrees/devref/index.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/modules.doctree b/doc/build/doctrees/devref/modules.doctree
deleted file mode 100644
index e6dcde834..000000000
--- a/doc/build/doctrees/devref/modules.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/network.doctree b/doc/build/doctrees/devref/network.doctree
deleted file mode 100644
index 57724103b..000000000
--- a/doc/build/doctrees/devref/network.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/nova.doctree b/doc/build/doctrees/devref/nova.doctree
deleted file mode 100644
index 3e243c00b..000000000
--- a/doc/build/doctrees/devref/nova.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/objectstore.doctree b/doc/build/doctrees/devref/objectstore.doctree
deleted file mode 100644
index 112c6856e..000000000
--- a/doc/build/doctrees/devref/objectstore.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/scheduler.doctree b/doc/build/doctrees/devref/scheduler.doctree
deleted file mode 100644
index a82138866..000000000
--- a/doc/build/doctrees/devref/scheduler.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/services.doctree b/doc/build/doctrees/devref/services.doctree
deleted file mode 100644
index b5bdb8f34..000000000
--- a/doc/build/doctrees/devref/services.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/devref/volume.doctree b/doc/build/doctrees/devref/volume.doctree
deleted file mode 100644
index 77ccc2f28..000000000
--- a/doc/build/doctrees/devref/volume.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/environment.pickle b/doc/build/doctrees/environment.pickle
deleted file mode 100644
index 6c3552ddc..000000000
--- a/doc/build/doctrees/environment.pickle
+++ /dev/null
diff --git a/doc/build/doctrees/index.doctree b/doc/build/doctrees/index.doctree
deleted file mode 100644
index 0ce64eaea..000000000
--- a/doc/build/doctrees/index.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/installer.doctree b/doc/build/doctrees/installer.doctree
deleted file mode 100644
index b193cbe32..000000000
--- a/doc/build/doctrees/installer.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/livecd.doctree b/doc/build/doctrees/livecd.doctree
deleted file mode 100644
index 7e9ae7f3e..000000000
--- a/doc/build/doctrees/livecd.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/man/novamanage.doctree b/doc/build/doctrees/man/novamanage.doctree
deleted file mode 100644
index cccfa3e65..000000000
--- a/doc/build/doctrees/man/novamanage.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/nova.concepts.doctree b/doc/build/doctrees/nova.concepts.doctree
deleted file mode 100644
index 71fcc46bf..000000000
--- a/doc/build/doctrees/nova.concepts.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/object.model.doctree b/doc/build/doctrees/object.model.doctree
deleted file mode 100644
index 16500b8e9..000000000
--- a/doc/build/doctrees/object.model.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/quickstart.doctree b/doc/build/doctrees/quickstart.doctree
deleted file mode 100644
index fad66f8dd..000000000
--- a/doc/build/doctrees/quickstart.doctree
+++ /dev/null
diff --git a/doc/build/doctrees/service.architecture.doctree b/doc/build/doctrees/service.architecture.doctree
deleted file mode 100644
index 4fc09dd05..000000000
--- a/doc/build/doctrees/service.architecture.doctree
+++ /dev/null
diff --git a/doc/source/adminguide/getting.started.rst b/doc/source/adminguide/getting.started.rst
index 7075a0b02..3e8073606 100644
--- a/doc/source/adminguide/getting.started.rst
+++ b/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
diff --git a/doc/source/adminguide/multi.node.install.rst b/doc/source/adminguide/multi.node.install.rst
index fa0652bc8..dcceb539b 100644
--- a/doc/source/adminguide/multi.node.install.rst
+++ b/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.
 
diff --git a/doc/source/devref/addmethod.openstackapi.rst b/doc/source/devref/addmethod.openstackapi.rst
new file mode 100644
index 000000000..6484613df
--- /dev/null
+++ b/doc/source/devref/addmethod.openstackapi.rst
@@ -0,0 +1,56 @@
+..
+      Copyright 2010 OpenStack LLC 
+      All Rights Reserved.
+
+      Licensed under the Apache License, Version 2.0 (the "License"); you may
+      not use this file except in compliance with the License. You may obtain
+      a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+      License for the specific language governing permissions and limitations
+      under the License.
+
+Adding a Method to the OpenStack API
+====================================
+
+The interface is a mostly RESTful API. REST stands for Representational State Transfer and provides an architecture "style" for distributed systems using HTTP for transport. Figure out a way to express your request and response in terms of resources that are being created, modified, read, or destroyed.
+
+Routing
+-------
+
+To map URLs to controllers+actions, OpenStack uses the Routes package, a clone of Rails routes for Python implementations. See http://routes.groovie.org/ fore more information.
+
+URLs are mapped to "action" methods on "controller" classes in nova/api/openstack/__init__/ApiRouter.__init__ .
+
+See http://routes.groovie.org/manual.html for all syntax, but you'll probably just need these two:
+   - mapper.connect() lets you map a single URL to a single action on a controller.
+   - mapper.resource() connects many standard URLs to actions on a controller.
+
+Controllers and actions
+-----------------------
+
+Controllers live in nova/api/openstack, and inherit from nova.wsgi.Controller.
+
+See nova/api/openstack/servers.py for an example.
+
+Action methods take parameters that are sucked out of the URL by mapper.connect() or .resource().  The first two parameters are self and the WebOb request, from which you can get the req.environ, req.body, req.headers, etc.
+
+Serialization
+-------------
+
+Actions return a dictionary, and wsgi.Controller serializes that to JSON or XML based on the request's content-type.
+
+If you define a new controller, you'll need to define a _serialization_metadata attribute on the class, to tell wsgi.Controller how to convert your dictionary to XML.  It needs to know the singular form of any list tag (e.g. <servers> list contains <server> tags) and which dictionary keys are to be XML attributes as opposed to subtags (e.g. <server id="4"/> instead of <server><id>4</id></server>).  
+
+See nova/api/openstack/servers.py for an example.
+
+Faults
+------
+
+If you need to return a non-200, you should
+return faults.Fault(webob.exc.HTTPNotFound())
+replacing the exception as appropriate.
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index 34104c964..6344c5382 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -15,7 +15,83 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Setting up a development environment
+Setting Up a Development Environment
 ====================================
 
-.. todo:: write this
+This page describes how to setup a working Python development environment that can be used in developing on OpenStack on Ubuntu or Mac OSX. These instructions assume you're already familiar with bzr and can pull down the code with an existing Launchpad account. Refer to http://wiki.openstack.org/LifeWithBzrAndLaunchpad for additional information.
+
+Linux Systems
+-------------
+
+Note: This section is tested for Nova on Ubuntu 10.10-64. Feel free to add notes and change according to your experiences or operating system.
+
+Bring down the Nova source with bzr, then:
+::
+  cd <your_src_dir>/nova
+  sudo apt-get install python-dev swig libssl-dev python-pip
+  sudo easy_install nose
+  pip install virtualenv
+  python tools/install_venv.py
+
+If all goes well, you should get a message something like this:
+::
+  Nova development environment setup is complete.
+
+Nova development uses virtualenv to track and manage Python dependencies while in development and testing. Virtual env gives you an independent Python environment.
+
+To activate the Nova virtualenv for the extent of your current shell session
+ you can run::
+ 
+     $ source .nova-venv/bin/activate 
+
+ Or, if you prefer, you can run commands in the virtualenv on a case by case
+ basis by running::
+
+     $ tools/with_venv.sh <your command>
+
+ Also, make test will automatically use the virtualenv.
+
+If you don't want to create a virtualenv every time you branch (which takes a while as long as we have the large Twisted project as a dependency) you can reuse a single virtualenv for all branches.
+
+ #. If you don't have a nova/ directory containing trunk/ and other branches, do so now.
+ #. Go into nova/trunk and install a virtualenv.
+ #. Move it up a level: mv nova/trunk/.nova-venv nova/.nova-venv.
+ #. Symlink the ../nova/.nova-venv directory from your branch:: 
+ 
+    ~/openstack/nova/my_branch$ ln -s ../.nova-venv .nova-venv
+
+This works with run_tests.sh and nosetests -w nova/tests/api
+
+MacOSX Systems
+--------------
+
+First, install Virtual Env, which creates an isolated "standalone" Python environment.::
+
+    sudo easy_install virtualenv
+
+
+Here's how to setup the code initially::
+
+    bzr branch lp:nova
+    cd nova
+    python tools/install_venv.py
+    source .nova_venv/bin/activate
+    pip install pep8 # submitting patch so that Nova has pep8 and pylint in PIP requirements file
+    pip install pylint
+
+If you have installed OpenSSL 1.0.0a on MacOS, which can happen when installing a MacPorts package for OpenSSL, you will see an error when running nova.tests.auth_unittest.AuthTestCase.test_209_can_generate_x509. The version that functions correctly is OpenSSL 0.9.8l 5, installed with MacOS 10.6 as a base element. 
+
+Here's how to get the latest code::
+
+  cd nova
+  bzr pull # get the latest stuff...
+  source .nova_venv/bin/activate
+  ./run_tests.sh
+
+And then you can do cleaning work or hack hack hack with a branched named cleaning::
+
+    bzr push lp:~launchpaduserid/nova/cleaning
+
+To submit the merge/patch that you hacked upon:
+ * Navigate to https://code.launchpad.net/~launchpaduserid/nova/cleaning.
+ * Click on the link "Propose for merging".
diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst
index e9c28305c..589609ace 100644
--- a/doc/source/devref/index.rst
+++ b/doc/source/devref/index.rst
@@ -23,8 +23,12 @@ In this section you will find information on Nova's lower level programming APIs
 
 Programming HowTos and Tutorials
 --------------------------------
+.. toctree::
+    :maxdepth: 3
+    
+    development.environment
+    addmethod.openstackapi
 
-.. todo:: Add some programming howtos and tuts
 
 Programming Concepts
 --------------------
diff --git a/doc/source/devref/rabbit.rst b/doc/source/devref/rabbit.rst
index 4468e575b..423284a55 100644
--- a/doc/source/devref/rabbit.rst
+++ b/doc/source/devref/rabbit.rst
@@ -32,7 +32,7 @@ Nova (Austin release) uses both direct and topic-based exchanges. The architectu
 Nova implements RPC (both request+response, and one-way, respectively nicknamed 'rpc.call' and 'rpc.cast') over AMQP by providing an adapter class which take cares of marshalling and unmarshalling of messages into function calls. Each Nova service (for example Compute, Volume, etc.) create two queues at the initialization time, one which accepts messages with routing keys 'NODE-TYPE.NODE-ID' (for example compute.hostname) and another, which accepts messages with routing keys as generic 'NODE-TYPE' (for example compute). The former is used specifically when Nova-API needs to redirect commands to a specific node like 'euca-terminate instance'. In this case, only the  compute node whose host's hypervisor is running the virtual machine can kill the instance. The API acts as a consumer when RPC calls are request/response, otherwise is acts as publisher only. 
 
 Nova RPC Mappings
-=================
+-----------------
 
 The figure below shows the internals of a RabbitMQ node when a single instance is deployed and shared in an OpenStack cloud. Every Nova component connects to the RabbitMQ instance and, depending on its personality (for example a compute node or a network node), may use the queue either as an Invoker (such as API or Scheduler) or a Worker (such as Compute, Volume or Network). Invokers and Workers do not actually exist in the Nova object model, but we are going to use them as an abstraction for sake of clarity. An Invoker is a component that sends messages in the queuing system via two operations: 1) rpc.call and ii) rpc.cast; a Worker is a component that receives messages from the queuing system and reply accordingly to rcp.call operations. 
 
@@ -52,7 +52,7 @@ Figure 2 shows the following internal elements:
 ..
 
 RPC Calls
-=========
+---------
 
 The diagram below shows the message flow during an rp.call operation: 
 
@@ -67,7 +67,7 @@ The diagram below shows the message flow during an rp.call operation:
 ..
 
 RPC Casts
-=========
+---------
 
 The diagram below the message flow during an rp.cast operation: 
 
@@ -80,7 +80,7 @@ The diagram below the message flow during an rp.cast operation:
 ..
 
 RabbitMQ Load
-=============
+-------------
 
 At any given time the load of a RabbitMQ node is function of the following parameters:
 
@@ -107,7 +107,7 @@ The figure below shows the status of the RabbitMQ node after Nova components' bo
 ..
 
 RabbitMQ Gotchas
-================
+----------------
 
 Nova uses Carrot to connect to the RabbitMQ environment. Carrot is a Python library that in turn uses AMQPLib, a library that implements the standard AMQP 0.8 at the time of writing. When using Carrot, Invokers and Workers need the following parameters in order to instantiate a Connection object that connects to the RabbitMQ server (please note that most of the following material can be also found in the Carrot documentation; it has been summarized and revised here for sake of clarity):
 
diff --git a/nova/adminclient.py b/nova/adminclient.py
index af55197fc..5a62cce7d 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -22,13 +22,15 @@ Nova User API client library.
 import base64
 import boto
 import httplib
+
+from nova import flags
 from boto.ec2.regioninfo import RegionInfo
 
 
+FLAGS = flags.FLAGS
+
 DEFAULT_CLC_URL = 'http://127.0.0.1:8773'
 DEFAULT_REGION = 'nova'
-DEFAULT_ACCESS_KEY = 'admin'
-DEFAULT_SECRET_KEY = 'admin'
 
 
 class UserInfo(object):
@@ -192,9 +194,13 @@ class HostInfo(object):
 
 
 class NovaAdminClient(object):
-    def __init__(self, clc_url=DEFAULT_CLC_URL, region=DEFAULT_REGION,
-                 access_key=DEFAULT_ACCESS_KEY, secret_key=DEFAULT_SECRET_KEY,
-                 **kwargs):
+    def __init__(
+            self,
+            clc_url=DEFAULT_CLC_URL,
+            region=DEFAULT_REGION,
+            access_key=FLAGS.aws_access_key_id,
+            secret_key=FLAGS.aws_secret_access_key,
+            **kwargs):
         parts = self.split_clc_url(clc_url)
 
         self.clc_url = clc_url
diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 7e75445a8..80f9f2109 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -22,7 +22,6 @@ Root WSGI middleware for all API controllers.
 
 :osapi_subdomain:  subdomain running the OpenStack API (default: api)
 :ec2api_subdomain:  subdomain running the EC2 API (default: ec2)
-:FAKE_subdomain:  set to 'api' or 'ec2', requests default to that endpoint
 
 """
 
diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py
index d0154600f..ce45b14f6 100644
--- a/nova/compute/monitor.py
+++ b/nova/compute/monitor.py
@@ -211,8 +211,8 @@ def store_graph(instance_id, filename):
     #       the response we can make our own client that does the actual
     #       request and hands it off to the response parser.
     s3 = boto.s3.connection.S3Connection(
-        aws_access_key_id='admin',
-        aws_secret_access_key='admin',
+        aws_access_key_id=FLAGS.aws_access_key_id,
+        aws_secret_access_key=FLAGS.aws_secret_access_key,
         is_secure=False,
         calling_format=boto.s3.connection.OrdinaryCallingFormat(),
         port=FLAGS.s3_port,
diff --git a/nova/flags.py b/nova/flags.py
index 121b9ca25..f7ae26050 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -179,6 +179,8 @@ DEFINE_list('region_list',
             [],
             'list of region=url pairs separated by commas')
 DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake')
+DEFINE_string('aws_access_key_id', 'admin', 'AWS Access ID')
+DEFINE_string('aws_secret_access_key', 'admin', 'AWS Access Key')
 DEFINE_integer('s3_port', 3333, 's3 port')
 DEFINE_string('s3_host', '127.0.0.1', 's3 host')
 DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on')
diff --git a/nova/server.py b/nova/server.py
index cb424caa1..a0ee54681 100644
--- a/nova/server.py
+++ b/nova/server.py
@@ -42,6 +42,8 @@ flags.DEFINE_bool('daemonize', False, 'daemonize this process')
 #              clutter.
 flags.DEFINE_bool('use_syslog', True, 'output to syslog when daemonizing')
 flags.DEFINE_string('logfile', None, 'log file to output to')
+flags.DEFINE_string('logdir',  None, 'directory to keep log files in '
+                                     '(will be prepended to $logfile)')
 flags.DEFINE_string('pidfile', None, 'pid file to output to')
 flags.DEFINE_string('working_directory', './', 'working directory...')
 flags.DEFINE_integer('uid', os.getuid(), 'uid under which to run')
@@ -119,6 +121,8 @@ def daemonize(args, name, main):
         else:
             if not FLAGS.logfile:
                 FLAGS.logfile = '%s.log' % name
+            if FLAGS.logdir:
+                FLAGS.logfile = os.path.join(FLAGS.logdir, FLAGS.logfile)
             logfile = logging.FileHandler(FLAGS.logfile)
             logfile.setFormatter(formatter)
             logger.addHandler(logfile)
diff --git a/nova/tests/misc_unittest.py b/nova/tests/misc_unittest.py
new file mode 100644
index 000000000..856060afa
--- /dev/null
+++ b/nova/tests/misc_unittest.py
@@ -0,0 +1,48 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright 2010 OpenStack LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import subprocess
+
+from nova import test
+from nova.utils import parse_mailmap, str_dict_replace
+
+
+class ProjectTestCase(test.TrialTestCase):
+    def test_authors_up_to_date(self):
+        if os.path.exists('../.bzr'):
+            log_cmd = subprocess.Popen(["bzr", "log", "-n0"],
+                                       stdout=subprocess.PIPE)
+            changelog = log_cmd.communicate()[0]
+            mailmap = parse_mailmap('../.mailmap')
+
+            contributors = set()
+            for l in changelog.split('\n'):
+                l = l.strip()
+                if (l.startswith('author:') or l.startswith('committer:')
+                         and not l == 'committer: Tarmac'):
+                    email = l.split(' ')[-1]
+                    contributors.add(str_dict_replace(email, mailmap))
+
+            authors_file = open('../Authors', 'r').read()
+
+            missing = set()
+            for contributor in contributors:
+                if not contributor in authors_file:
+                    missing.add(contributor)
+
+            self.assertTrue(len(missing) == 0,
+                            '%r not listed in Authors' % missing)
diff --git a/nova/twistd.py b/nova/twistd.py
index 3ec0ff61e..cb5648ce6 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -43,6 +43,8 @@ else:
 
 
 FLAGS = flags.FLAGS
+flags.DEFINE_string('logdir',  None, 'directory to keep log files in '
+                                     '(will be prepended to $logfile)')
 
 
 class TwistdServerOptions(ServerOptions):
@@ -246,6 +248,8 @@ def serve(filename):
         FLAGS.logfile = '%s.log' % name
     elif FLAGS.logfile.endswith('twistd.log'):
         FLAGS.logfile = FLAGS.logfile.replace('twistd.log', '%s.log' % name)
+    if FLAGS.logdir:
+        FLAGS.logfile = os.path.join(FLAGS.logdir, FLAGS.logfile)
     if not FLAGS.prefix:
         FLAGS.prefix = name
     elif FLAGS.prefix.endswith('twisted'):
diff --git a/nova/utils.py b/nova/utils.py
index 2970b93bb..142584df8 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -175,6 +175,24 @@ def parse_isotime(timestr):
     return datetime.datetime.strptime(timestr, TIME_FORMAT)
 
 
+def parse_mailmap(mailmap='.mailmap'):
+    mapping = {}
+    if os.path.exists(mailmap):
+        fp = open(mailmap, 'r')
+        for l in fp:
+            l = l.strip()
+            if not l.startswith('#') and ' ' in l:
+                canonical_email, alias = l.split(' ')
+                mapping[alias] = canonical_email
+    return mapping
+
+
+def str_dict_replace(s, mapping):
+    for s1, s2 in mapping.iteritems():
+        s = s.replace(s1, s2)
+    return s
+
+
 class LazyPluggable(object):
     """A pluggable backend loaded lazily based on some value."""
 
diff --git a/run_tests.py b/run_tests.py
index 101ed1a0b..3d427d8af 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -49,11 +49,12 @@ from nova import flags
 from nova import twistd
 
 from nova.tests.access_unittest import *
-from nova.tests.auth_unittest import *
 from nova.tests.api_unittest import *
+from nova.tests.auth_unittest import *
 from nova.tests.cloud_unittest import *
 from nova.tests.compute_unittest import *
 from nova.tests.flags_unittest import *
+from nova.tests.misc_unittest import *
 from nova.tests.network_unittest import *
 from nova.tests.objectstore_unittest import *
 from nova.tests.process_unittest import *
@@ -64,6 +65,7 @@ from nova.tests.service_unittest import *
 from nova.tests.twistd_unittest import *
 from nova.tests.validator_unittest import *
 from nova.tests.virt_unittest import *
+from nova.tests.virt_unittest import *
 from nova.tests.volume_unittest import *
 
 
diff --git a/setup.py b/setup.py
index 33d815fa6..ec0014478 100644
--- a/setup.py
+++ b/setup.py
@@ -16,13 +16,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
+import subprocess
+
 from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
 from sphinx.setup_command import BuildDoc
 
-import os
-import subprocess
-
+from nova.utils import parse_mailmap, str_dict_replace
 
 class local_BuildDoc(BuildDoc):
     def run(self):
@@ -42,8 +43,9 @@ class local_sdist(sdist):
             log_cmd = subprocess.Popen(["bzr", "log", "--novalog"],
                                        stdout=subprocess.PIPE, env=env)
             changelog = log_cmd.communicate()[0]
+            mailmap = parse_mailmap()
             with open("ChangeLog", "w") as changelog_file:
-                changelog_file.write(changelog)
+                changelog_file.write(str_dict_replace(changelog, mailmap))
         sdist.run(self)
 
 setup(name='nova',