Merged trunk

24 files changed, 0 insertions, 776 deletions

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 31dd5e91e..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,232 +0,0 @@
-nova (0.2.3-1) UNRELEASED; urgency=low
-
-  * Relax the Twisted dependency to python-twisted-core (rather than the
-    full stack).
-  * Move nova related configuration files into /etc/nova/.
-  * Add a dependency on nginx from nova-objectsstore and install a
-    suitable configuration file.
-  * Ship the CA directory in nova-common.
-  * Add a default flag file for nova-manage to help it find the CA.
-  * If set, pass KernelId and RamdiskId from RunInstances call to the
-    target compute node.
-  * Added --network_path setting to nova-compute's flagfile.
-  * Move templates from python directories to /usr/share/nova.
-  * Add debian/nova-common.dirs to create
-    var/lib/nova/{buckets,CA,images,instances,keys,networks}
-  * Don't pass --daemonize=1 to nova-compute. It's already daemonising
-    by default.
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 14 Jul 2010 12:00:00 -0700
-
-nova (0.2.2-10) UNRELEASED; urgency=low
-
-  * Fixed extra space in vblade-persist
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 13 Jul 2010 19:00:00 -0700
-
-nova (0.2.2-9) UNRELEASED; urgency=low
-
-  * Fixed invalid dn bug in ldap for adding roles
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 12 Jul 2010 15:20:00 -0700
-
-nova (0.2.2-8) UNRELEASED; urgency=low
-
-  * Added a missing comma
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 08 Jul 2010 10:05:00 -0700
-
-nova (0.2.2-7) UNRELEASED; urgency=low
-
-  * Missing files from twisted patch
-  * License upedates
-  * Reformatting/cleanup
-  * Users/ldap bugfixes
-  * Merge fixes
-  * Documentation updates
-  * Vpn key creation fix
-  * Multiple shelves for volumes
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Wed, 07 Jul 2010 18:45:00 -0700
-
-nova (0.2.2-6) UNRELEASED; urgency=low
-
-  * Fix to make Key Injection work again
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 14 Jun 2010 21:35:00 -0700
-
-nova (0.2.2-5) UNRELEASED; urgency=low
-
-  * Lowered message callback frequency to stop compute and volume
-    from eating tons of cpu
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 14 Jun 2010 14:15:00 -0700
-
-nova (0.2.2-4) UNRELEASED; urgency=low
-
-  * Documentation fixes
-  * Uncaught exceptions now log properly
-  * Nova Manage zip exporting works again
-  * Twisted threads no longer interrupt system calls
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Sun, 13 Jun 2010 01:40:00 -0700
-
-nova (0.2.2-3) UNRELEASED; urgency=low
-
-  * Fixes to api calls
-  * More accurate documentation
-  * Removal of buggy multiprocessing
-  * Asynchronus execution of shell commands
-  * Fix of messaging race condition
-  * Test redis database cleaned out on each run of tests
-  * Smoketest updates
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Fri, 12 Jun 2010 20:10:00 -0700
-
-nova (0.2.2-2) UNRELEASED; urgency=low
-
-  * Bugfixes to volume code
-  * Instances no longer use keeper
-  * Sectors off by one fix
-  * State reported properly by instances
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Wed, 03 Jun 2010 15:21:00 -0700
-
-nova (0.2.2-1) UNRELEASED; urgency=low
-
-  * First release based on nova/cc
-  * Major rewrites to volumes and instances
-  * Addition of cloudpipe and rbac
-  * Major bugfixes
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Wed, 02 Jun 2010 17:42:00 -0700
-
-nova (0.2.1-1) UNRELEASED; urgency=low
-
-  * Support ephemeral (local) space for instances
-  * instance related fixes
-  * fix network & cloudpipe bugs
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 25 May 2010 12:14:00 -0700
-
-nova (0.2.0-20) UNRELEASED; urgency=low
-
-  * template files are in proper folder
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 25 May 2010 12:14:00 -0700
-
-nova (0.2.0-19) UNRELEASED; urgency=low
-
-  * removed mox dependency and added templates to install
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 25 May 2010 11:53:00 -0700
-
-nova (0.2.0-18) UNRELEASED; urgency=low
-
-  * api server properly sends instance status code
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 24 May 2010 17:18:00 -0700
-
-nova (0.2.0-17) UNRELEASED; urgency=low
-
-  * redis-backed datastore
-
- -- Vishvananda Ishaya <vishvananda@gmail.com>  Mon, 24 May 2010 16:28:00 -0700
-
-nova (0.2.0-16) UNRELEASED; urgency=low
-
-  * make sure twistd.pid is really overriden
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 22:18:47 -0700
-
-nova (0.2.0-15) UNRELEASED; urgency=low
-
-  * rpc shouldn't require tornado unless you are using attach_to_tornado
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Sun, 23 May 2010 21:59:00 -0700
-
-nova (0.2.0-14) UNRELEASED; urgency=low
-
-  * quicky init scripts for the other services, based on nova-objectstore
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 21:49:43 -0700
-
-nova (0.2.0-13) UNRELEASED; urgency=low
-
-  * init script for nova-objectstore
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 21:33:25 -0700
-
-nova (0.2.0-12) UNRELEASED; urgency=low
-
-  * kvm, kpartx required for nova-compute
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Sun, 23 May 2010 21:32:00 -0700
-
-nova (0.2.0-11) UNRELEASED; urgency=low
-
-  * Need to include the python modules in nova-common.install as well.
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 20:04:27 -0700
-
-nova (0.2.0-10) UNRELEASED; urgency=low
-
-  * add more requirements to bin packages
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Sun, 23 May 2010 19:54:00 -0700
-
-nova (0.2.0-9) UNRELEASED; urgency=low
-
-  * nova bin packages should depend on the same version of nova-common they
-    were built from.
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 18:46:34 -0700
-
-nova (0.2.0-8) UNRELEASED; urgency=low
-
-  * Require libvirt 0.8.1 or newer for nova-compute
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Sun, 23 May 2010 18:33:00 -0700
-
-nova (0.2.0-7) UNRELEASED; urgency=low
-
-  * Split bins into separate packages
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 18:46:34 -0700
-
-nova (0.2.0-6) UNRELEASED; urgency=low
-
-  * Add python-m2crypto to deps
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Sun, 23 May 2010 18:33:00 -0700
-
-nova (0.2.0-5) UNRELEASED; urgency=low
-
-  * Add python-gflags to deps
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 18:28:50 -0700
-
-nova (0.2.0-4) UNRELEASED; urgency=low
-
-  * install scripts
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 18:16:27 -0700
-
-nova (0.2.0-3) UNRELEASED; urgency=low
-
-  * debian build goop
-
- -- Manish Singh <yosh@gimp.org>  Sun, 23 May 2010 18:06:37 -0700
-
-nova (0.2.0-2) UNRELEASED; urgency=low
-
-  * improved requirements
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Sun, 23 May 2010 17:42:00 -0700
-
-nova (0.2.0-1) UNRELEASED; urgency=low
-
-  * initial release
-
- -- Jesse Andrews <anotherjesse@gmail.com>  Fri, 21 May 2010 12:28:00 -0700
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index a6d12f36e..000000000
--- a/debian/control
+++ /dev/null
@@ -1,136 +0,0 @@
-Source: nova
-Section: net
-Priority: extra
-Maintainer: Jesse Andrews <jesse@ansolabs.com>
-Build-Depends: debhelper (>= 7), redis-server (>=2:2.0.0~rc1), python-m2crypto
-Build-Depends-Indep: python-support, python-setuptools
-Standards-Version: 3.8.4
-XS-Python-Version: 2.6
-
-Package: nova-common
-Architecture: all
-Depends: ${python:Depends}, aoetools, vlan, python-ipy, python-boto, python-m2crypto, python-pycurl, python-twisted-core, python-daemon, python-redis, python-carrot, python-lockfile, python-gflags, python-tornado, ${misc:Depends}
-Provides: ${python:Provides}
-Description: Nova Cloud Computing - common files
- Nova is a cloud computing fabric controller (the main part of an IaaS
- system) built to match the popular AWS EC2 and S3 APIs. It is written in
- Python, using the Tornado and Twisted frameworks, and relies on the
- standard AMQP messaging protocol, and the Redis distributed KVS.
- .
- Nova is intended to be easy to extend, and adapt. For example, it
- currently uses an LDAP server for users and groups, but also includes a
- fake LDAP server, that stores data in Redis. It has extensive test
- coverage, and uses the Sphinx toolkit (the same as Python itself) for code
- and user documentation.
- .
- While Nova is currently in Beta use within several organizations, the
- codebase is very much under active development.
- .
- This package contains things that are needed by all parts of Nova.
-
-Package: nova-compute
-Architecture: all
-Depends: nova-common (= ${binary:Version}), kpartx, kvm, python-libvirt, libvirt-bin (>= 0.7.5), curl, ${python:Depends}, ${misc:Depends}
-Description: Nova Cloud Computing - compute node
- Nova is a cloud computing fabric controller (the main part of an IaaS
- system) built to match the popular AWS EC2 and S3 APIs. It is written in
- Python, using the Tornado and Twisted frameworks, and relies on the
- standard AMQP messaging protocol, and the Redis distributed KVS.
- .
- Nova is intended to be easy to extend, and adapt. For example, it
- currently uses an LDAP server for users and groups, but also includes a
- fake LDAP server, that stores data in Redis. It has extensive test
- coverage, and uses the Sphinx toolkit (the same as Python itself) for code
- and user documentation.
- .
- While Nova is currently in Beta use within several organizations, the
- codebase is very much under active development.
- .
- This is the package you will install on the nodes that will run your
- virtual machines.
-
-Package: nova-volume
-Architecture: all
-Depends: nova-common (= ${binary:Version}), vblade, vblade-persist, ${python:Depends}, ${misc:Depends}
-Description: Nova Cloud Computing - storage
- Nova is a cloud computing fabric controller (the main part of an IaaS
- system) built to match the popular AWS EC2 and S3 APIs. It is written in
- Python, using the Tornado and Twisted frameworks, and relies on the
- standard AMQP messaging protocol, and the Redis distributed KVS.
- .
- Nova is intended to be easy to extend, and adapt. For example, it
- currently uses an LDAP server for users and groups, but also includes a
- fake LDAP server, that stores data in Redis. It has extensive test
- coverage, and uses the Sphinx toolkit (the same as Python itself) for code
- and user documentation.
- .
- While Nova is currently in Beta use within several organizations, the
- codebase is very much under active development.
- .
- This is the package you will install on your storage nodes.
-
-Package: nova-api
-Architecture: all
-Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Description: Nova Cloud Computing - API frontend 
- Nova is a cloud computing fabric controller (the main part of an IaaS
- system) built to match the popular AWS EC2 and S3 APIs. It is written in
- Python, using the Tornado and Twisted frameworks, and relies on the
- standard AMQP messaging protocol, and the Redis distributed KVS.
- .
- Nova is intended to be easy to extend, and adapt. For example, it
- currently uses an LDAP server for users and groups, but also includes a
- fake LDAP server, that stores data in Redis. It has extensive test
- coverage, and uses the Sphinx toolkit (the same as Python itself) for code
- and user documentation.
- .
- While Nova is currently in Beta use within several organizations, the
- codebase is very much under active development.
- .
- This package provides the API frontend.
-
-Package: nova-objectstore
-Architecture: all
-Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Description: Nova Cloud Computing - object store
- Nova is a cloud computing fabric controller (the main part of an IaaS
- system) built to match the popular AWS EC2 and S3 APIs. It is written in
- Python, using the Tornado and Twisted frameworks, and relies on the
- standard AMQP messaging protocol, and the Redis distributed KVS.
- .
- Nova is intended to be easy to extend, and adapt. For example, it
- currently uses an LDAP server for users and groups, but also includes a
- fake LDAP server, that stores data in Redis. It has extensive test
- coverage, and uses the Sphinx toolkit (the same as Python itself) for code
- and user documentation.
- .
- While Nova is currently in Beta use within several organizations, the
- codebase is very much under active development.
- .
- This is the package you will install on the nodes that will contain your
- object store.
-
-Package: nova-instancemonitor
-Architecture: all
-Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Description: Nova instance monitor
-
-Package: nova-tools
-Architecture: all
-Depends: python-boto, ${python:Depends}, ${misc:Depends}
-Description: Nova Cloud Computing - management tools
- Nova is a cloud computing fabric controller (the main part of an IaaS
- system) built to match the popular AWS EC2 and S3 APIs. It is written in
- Python, using the Tornado and Twisted frameworks, and relies on the
- standard AMQP messaging protocol, and the Redis distributed KVS.
- .
- Nova is intended to be easy to extend, and adapt. For example, it
- currently uses an LDAP server for users and groups, but also includes a
- fake LDAP server, that stores data in Redis. It has extensive test
- coverage, and uses the Sphinx toolkit (the same as Python itself) for code
- and user documentation.
- .
- While Nova is currently in Beta use within several organizations, the
- codebase is very much under active development.
- .
- This package contains admin tools for Nova.
diff --git a/debian/nova-api.conf b/debian/nova-api.conf
deleted file mode 100644
index 3e6c056ad..000000000
--- a/debian/nova-api.conf
+++ /dev/null
@@ -1,5 +0,0 @@
---daemonize=1
---ca_path=/var/lib/nova/CA
---keys_path=/var/lib/nova/keys
---networks_path=/var/lib/nova/networks
---dhcpbridge_flagfile=/etc/nova/nova-dhcpbridge.conf
diff --git a/debian/nova-api.init b/debian/nova-api.init
deleted file mode 100644
index 597fbef95..000000000
--- a/debian/nova-api.init
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-api
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-api
-# Description:       nova-api
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-api
-DAEMON_ARGS="--flagfile=/etc/nova/nova-api.conf"
-PIDFILE=/var/run/nova-api.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-api; then
-  . /etc/default/nova-api
-fi
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova api" "nova-api"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS start; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova api" "nova-api"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS stop; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS restart; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-api && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-api {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/debian/nova-api.install b/debian/nova-api.install
deleted file mode 100644
index 89615d302..000000000
--- a/debian/nova-api.install
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/nova-api usr/bin
-debian/nova-api.conf etc/nova
-debian/nova-dhcpbridge.conf etc/nova
diff --git a/debian/nova-common.dirs b/debian/nova-common.dirs
deleted file mode 100644
index b58fe8b7f..000000000
--- a/debian/nova-common.dirs
+++ /dev/null
@@ -1,11 +0,0 @@
-etc/nova
-var/lib/nova/buckets
-var/lib/nova/CA
-var/lib/nova/CA/INTER
-var/lib/nova/CA/newcerts
-var/lib/nova/CA/private
-var/lib/nova/CA/reqs
-var/lib/nova/images
-var/lib/nova/instances
-var/lib/nova/keys
-var/lib/nova/networks
diff --git a/debian/nova-common.install b/debian/nova-common.install
deleted file mode 100644
index 93251363a..000000000
--- a/debian/nova-common.install
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/nova-manage                       usr/bin
-debian/nova-manage.conf               etc/nova
-nova/auth/novarc.template             usr/share/nova
-nova/cloudpipe/client.ovpn.template   usr/share/nova
-nova/compute/libvirt.xml.template     usr/share/nova
-nova/compute/interfaces.template      usr/share/nova
-CA/openssl.cnf.tmpl                   var/lib/nova/CA
-CA/geninter.sh                        var/lib/nova/CA
-CA/genrootca.sh                       var/lib/nova/CA
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
deleted file mode 100644
index 11de13ff6..000000000
--- a/debian/nova-compute.conf
+++ /dev/null
@@ -1,7 +0,0 @@
---ca_path=/var/lib/nova/CA
---keys_path=/var/lib/nova/keys
---instances_path=/var/lib/nova/instances
---simple_network_template=/usr/share/nova/interfaces.template
---libvirt_xml_template=/usr/share/nova/libvirt.xml.template
---vpn_client_template=/usr/share/nova/client.ovpn.template
---credentials_template=/usr/share/nova/novarc.template
diff --git a/debian/nova-compute.init b/debian/nova-compute.init
deleted file mode 100644
index d0f093a7a..000000000
--- a/debian/nova-compute.init
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-compute
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-compute
-# Description:       nova-compute
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-compute
-DAEMON_ARGS="--flagfile=/etc/nova/nova-compute.conf"
-PIDFILE=/var/run/nova-compute.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-compute; then
-  . /etc/default/nova-compute
-fi
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova compute" "nova-compute"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS start; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova compute" "nova-compute"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS stop; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS restart; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-compute && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-compute {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/debian/nova-compute.install b/debian/nova-compute.install
deleted file mode 100644
index 5f9df46a8..000000000
--- a/debian/nova-compute.install
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/nova-compute usr/bin
-debian/nova-compute.conf etc/nova
diff --git a/debian/nova-dhcpbridge.conf b/debian/nova-dhcpbridge.conf
deleted file mode 100644
index 68cb8903e..000000000
--- a/debian/nova-dhcpbridge.conf
+++ /dev/null
@@ -1 +0,0 @@
---networks_path=/var/lib/nova/networks
diff --git a/debian/nova-instancemonitor.init b/debian/nova-instancemonitor.init
deleted file mode 100644
index 2865fc334..000000000
--- a/debian/nova-instancemonitor.init
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-instancemonitor
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-instancemonitor
-# Description:       nova-instancemonitor
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-instancemonitor
-DAEMON_ARGS="--flagfile=/etc/nova.conf"
-PIDFILE=/var/run/nova-instancemonitor.pid
-
-ENABLED=false
-
-if test -f /etc/default/nova-instancemonitor; then
-  . /etc/default/nova-instancemonitor
-fi
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova compute" "nova-instancemonitor"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS start; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova compute" "nova-instancemonitor"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS stop; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS restart; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-instancemonitor && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-instancemonitor {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/debian/nova-instancemonitor.install b/debian/nova-instancemonitor.install
deleted file mode 100644
index 48e7884b4..000000000
--- a/debian/nova-instancemonitor.install
+++ /dev/null
@@ -1 +0,0 @@
-bin/nova-instancemonitor usr/bin
diff --git a/debian/nova-manage.conf b/debian/nova-manage.conf
deleted file mode 100644
index 5ccda7ecf..000000000
--- a/debian/nova-manage.conf
+++ /dev/null
@@ -1,4 +0,0 @@
---ca_path=/var/lib/nova/CA
---credentials_template=/usr/share/nova/novarc.template
---keys_path=/var/lib/nova/keys
---vpn_client_template=/usr/share/nova/client.ovpn.template
diff --git a/debian/nova-objectstore.conf b/debian/nova-objectstore.conf
deleted file mode 100644
index 8eca39715..000000000
--- a/debian/nova-objectstore.conf
+++ /dev/null
@@ -1,5 +0,0 @@
---daemonize=1
---ca_path=/var/lib/nova/CA
---keys_path=/var/lib/nova/keys
---images_path=/var/lib/nova/images
---buckets_path=/var/lib/nova/buckets
diff --git a/debian/nova-objectstore.init b/debian/nova-objectstore.init
deleted file mode 100644
index 9676345ad..000000000
--- a/debian/nova-objectstore.init
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-objectstore
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-objectstore
-# Description:       nova-objectstore
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-objectstore
-DAEMON_ARGS="--flagfile=/etc/nova/nova-objectstore.conf"
-PIDFILE=/var/run/nova-objectstore.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-objectstore; then
-  . /etc/default/nova-objectstore
-fi
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova objectstore" "nova-objectstore"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS start; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova objectstore" "nova-objectstore"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS stop; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS restart; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-objectstore && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-objectstore {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/debian/nova-objectstore.install b/debian/nova-objectstore.install
deleted file mode 100644
index c5b3d997a..000000000
--- a/debian/nova-objectstore.install
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/nova-objectstore usr/bin
-debian/nova-objectstore.conf etc/nova
diff --git a/debian/nova-volume.conf b/debian/nova-volume.conf
deleted file mode 100644
index 57e3411a0..000000000
--- a/debian/nova-volume.conf
+++ /dev/null
@@ -1,4 +0,0 @@
---ca_path=/var/lib/nova/CA
---keys_path=/var/lib/nova/keys
---images_path=/var/lib/nova/images
---buckets_path=/var/lib/nova/buckets
diff --git a/debian/nova-volume.init b/debian/nova-volume.init
deleted file mode 100644
index d5c2dddf8..000000000
--- a/debian/nova-volume.init
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-volume
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-volume
-# Description:       nova-volume
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-volume
-DAEMON_ARGS="--flagfile=/etc/nova/nova-volume.conf"
-PIDFILE=/var/run/nova-volume.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-volume; then
-  . /etc/default/nova-volume
-fi
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Starting nova volume" "nova-volume"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS start; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    log_daemon_msg "Stopping nova volume" "nova-volume"
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS stop; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  restart|force-reload)
-    test "$ENABLED" = "true" || exit 1
-    cd /var/run
-    if $DAEMON $DAEMON_ARGS restart; then
-      log_end_msg 0
-    else
-      log_end_msg 1
-    fi
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-volume && exit 0 || exit $?
-    ;;
-  *)
-    log_action_msg "Usage: /etc/init.d/nova-volume {start|stop|restart|force-reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/debian/nova-volume.install b/debian/nova-volume.install
deleted file mode 100644
index 9a840c78e..000000000
--- a/debian/nova-volume.install
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/nova-volume usr/bin
-debian/nova-volume.conf etc/nova
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf0888..000000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index 0c043f18c..000000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.6-
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 2d33f6ac8..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@