From 446d5feb6b367fc389a1d7fcde9421c9516671f8 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Wed, 30 Jun 2010 16:45:41 +0200
Subject: [PATCH 01/24] Use separate configuration files for the different
 daemons.

---
 debian/nova-api.conf            | 3 +++
 debian/nova-api.init            | 4 ++--
 debian/nova-api.install         | 1 +
 debian/nova-compute.conf        | 3 +++
 debian/nova-compute.init        | 4 ++--
 debian/nova-compute.install     | 1 +
 debian/nova-objectstore.conf    | 5 +++++
 debian/nova-objectstore.init    | 4 ++--
 debian/nova-objectstore.install | 1 +
 debian/nova-volume.conf         | 5 +++++
 debian/nova-volume.init         | 4 ++--
 debian/nova-volume.install      | 1 +
 12 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 debian/nova-api.conf
 create mode 100644 debian/nova-compute.conf
 create mode 100644 debian/nova-objectstore.conf
 create mode 100644 debian/nova-volume.conf

diff --git a/debian/nova-api.conf b/debian/nova-api.conf
new file mode 100644
index 00000000..62bfd016
--- /dev/null
+++ b/debian/nova-api.conf
@@ -0,0 +1,3 @@
+--daemonize=1
+--ca_path=/usr/share/nova/CA
+--fake_users=1
diff --git a/debian/nova-api.init b/debian/nova-api.init
index 925c92c5..77d9b244 100644
--- a/debian/nova-api.init
+++ b/debian/nova-api.init
@@ -13,10 +13,10 @@
 set -e
 
 DAEMON=/usr/bin/nova-api
-DAEMON_ARGS="--flagfile=/etc/nova.conf"
+DAEMON_ARGS="--flagfile=/etc/nova-api.conf"
 PIDFILE=/var/run/nova-api.pid
 
-ENABLED=false
+ENABLED=true
 
 if test -f /etc/default/nova-api; then
   . /etc/default/nova-api
diff --git a/debian/nova-api.install b/debian/nova-api.install
index 757235b1..d1f5d7d5 100644
--- a/debian/nova-api.install
+++ b/debian/nova-api.install
@@ -1 +1,2 @@
 bin/nova-api usr/bin
+debian/nova-api.conf etc
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
new file mode 100644
index 00000000..62bfd016
--- /dev/null
+++ b/debian/nova-compute.conf
@@ -0,0 +1,3 @@
+--daemonize=1
+--ca_path=/usr/share/nova/CA
+--fake_users=1
diff --git a/debian/nova-compute.init b/debian/nova-compute.init
index 89d0e5fc..820cf3d3 100644
--- a/debian/nova-compute.init
+++ b/debian/nova-compute.init
@@ -13,10 +13,10 @@
 set -e
 
 DAEMON=/usr/bin/nova-compute
-DAEMON_ARGS="--flagfile=/etc/nova.conf"
+DAEMON_ARGS="--flagfile=/etc/nova-compute.conf"
 PIDFILE=/var/run/nova-compute.pid
 
-ENABLED=false
+ENABLED=true
 
 if test -f /etc/default/nova-compute; then
   . /etc/default/nova-compute
diff --git a/debian/nova-compute.install b/debian/nova-compute.install
index 6387cef0..20db74f1 100644
--- a/debian/nova-compute.install
+++ b/debian/nova-compute.install
@@ -1 +1,2 @@
 bin/nova-compute usr/bin
+debian/nova-compute.conf etc
diff --git a/debian/nova-objectstore.conf b/debian/nova-objectstore.conf
new file mode 100644
index 00000000..4b74efe0
--- /dev/null
+++ b/debian/nova-objectstore.conf
@@ -0,0 +1,5 @@
+--daemonize=1
+--ca_path=/usr/share/nova/CA
+--fake_users=1
+--images_path=/var/lib/nova/images
+--buckets_path=/var/lib/nova/buckets
diff --git a/debian/nova-objectstore.init b/debian/nova-objectstore.init
index be7d32d8..7f37ac8a 100644
--- a/debian/nova-objectstore.init
+++ b/debian/nova-objectstore.init
@@ -13,10 +13,10 @@
 set -e
 
 DAEMON=/usr/bin/nova-objectstore
-DAEMON_ARGS="--flagfile=/etc/nova.conf"
+DAEMON_ARGS="--flagfile=/etc/nova-objectstore.conf"
 PIDFILE=/var/run/nova-objectstore.pid
 
-ENABLED=false
+ENABLED=true
 
 if test -f /etc/default/nova-objectstore; then
   . /etc/default/nova-objectstore
diff --git a/debian/nova-objectstore.install b/debian/nova-objectstore.install
index ccc60fcc..14a6dd37 100644
--- a/debian/nova-objectstore.install
+++ b/debian/nova-objectstore.install
@@ -1 +1,2 @@
 bin/nova-objectstore usr/bin
+debian/nova-objectstore.conf etc
diff --git a/debian/nova-volume.conf b/debian/nova-volume.conf
new file mode 100644
index 00000000..4b74efe0
--- /dev/null
+++ b/debian/nova-volume.conf
@@ -0,0 +1,5 @@
+--daemonize=1
+--ca_path=/usr/share/nova/CA
+--fake_users=1
+--images_path=/var/lib/nova/images
+--buckets_path=/var/lib/nova/buckets
diff --git a/debian/nova-volume.init b/debian/nova-volume.init
index 80da3f70..069b4781 100644
--- a/debian/nova-volume.init
+++ b/debian/nova-volume.init
@@ -13,10 +13,10 @@
 set -e
 
 DAEMON=/usr/bin/nova-volume
-DAEMON_ARGS="--flagfile=/etc/nova.conf"
+DAEMON_ARGS="--flagfile=/etc/nova-volume.conf"
 PIDFILE=/var/run/nova-volume.pid
 
-ENABLED=false
+ENABLED=true
 
 if test -f /etc/default/nova-volume; then
   . /etc/default/nova-volume
diff --git a/debian/nova-volume.install b/debian/nova-volume.install
index 37b535c0..e7e17201 100644
--- a/debian/nova-volume.install
+++ b/debian/nova-volume.install
@@ -1 +1,2 @@
 bin/nova-volume usr/bin
+debian/nova-volume.conf etc

From 3b4a8a00e09302661543ade09ce7f68e3dcdfc58 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Wed, 30 Jun 2010 16:46:02 +0200
Subject: [PATCH 02/24] Expand somewhat on the short and long descriptions in
 debian/control.

---
 debian/control | 111 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 101 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index a50e6ecf..65af8f0c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,38 +3,129 @@ Section: net
 Priority: extra
 Maintainer: Jesse Andrews <jesse@ansolabs.com>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python-support
+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 (>= 10.0.0-2ubuntu2nebula1), python-daemon, python-redis, python-carrot, python-lockfile, python-gflags, python-tornado, ${misc:Depends}
+Depends: ${python:Depends}, aoetools, vlan, python-ipy, python-boto, python-m2crypto, python-pycurl, python-twisted, python-daemon, python-redis, python-carrot, python-lockfile, python-gflags, python-tornado, ${misc:Depends}
 Provides: ${python:Provides}
-Conflicts: nova
-Description: Nova is a cloud
+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.8.1), ${python:Depends}, ${misc:Depends}
-Description: Nova compute
+Depends: nova-common (= ${binary:Version}), kpartx, kvm, python-libvirt, libvirt-bin (>= 0.7.5), ${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 volume
+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 api
+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 object store
+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-tools
 Architecture: all
 Depends: python-boto, ${python:Depends}, ${misc:Depends}
-Description: CLI tools to access nova
+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.

From 22c40f6f3a52af5262ba47bf6ea5802c86e2cc05 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Thu, 1 Jul 2010 13:14:08 +0200
Subject: [PATCH 06/24] Add curl as a dependency of nova-compute.

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 65af8f0c..c0b08ae8 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Description: Nova Cloud Computing - common files
 
 Package: nova-compute
 Architecture: all
-Depends: nova-common (= ${binary:Version}), kpartx, kvm, python-libvirt, libvirt-bin (>= 0.7.5), ${python:Depends}, ${misc:Depends}
+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

From ea6ce3fd60c9b986c8a64ace7cafdc98446bc493 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 12:45:35 +0200
Subject: [PATCH 07/24] Set better defaults in flagfiles.

---
 debian/nova-api.conf         | 4 +++-
 debian/nova-compute.conf     | 4 +++-
 debian/nova-objectstore.conf | 4 +++-
 debian/nova-volume.conf      | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/nova-api.conf b/debian/nova-api.conf
index 62bfd016..4bf25fc7 100644
--- a/debian/nova-api.conf
+++ b/debian/nova-api.conf
@@ -1,3 +1,5 @@
 --daemonize=1
---ca_path=/usr/share/nova/CA
+--ca_path=/var/lib/nova/CA
+--keys_path=/var/lib/nova/keys
 --fake_users=1
+--keeper_path=/var/lib/nova/keeper
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index 62bfd016..61ab4ceb 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -1,3 +1,5 @@
 --daemonize=1
---ca_path=/usr/share/nova/CA
+--ca_path=/var/lib/nova/CA
+--keys_path=/var/lib/nova/keys
+--keeper_path=/var/lib/nova/keeper
 --fake_users=1
diff --git a/debian/nova-objectstore.conf b/debian/nova-objectstore.conf
index 4b74efe0..7c3b633b 100644
--- a/debian/nova-objectstore.conf
+++ b/debian/nova-objectstore.conf
@@ -1,5 +1,7 @@
 --daemonize=1
---ca_path=/usr/share/nova/CA
+--ca_path=/var/lib/nova/CA
+--keys_path=/var/lib/nova/keys
+--keeper_path=/var/lib/nova/keeper
 --fake_users=1
 --images_path=/var/lib/nova/images
 --buckets_path=/var/lib/nova/buckets
diff --git a/debian/nova-volume.conf b/debian/nova-volume.conf
index 4b74efe0..7c3b633b 100644
--- a/debian/nova-volume.conf
+++ b/debian/nova-volume.conf
@@ -1,5 +1,7 @@
 --daemonize=1
---ca_path=/usr/share/nova/CA
+--ca_path=/var/lib/nova/CA
+--keys_path=/var/lib/nova/keys
+--keeper_path=/var/lib/nova/keeper
 --fake_users=1
 --images_path=/var/lib/nova/images
 --buckets_path=/var/lib/nova/buckets

From 09f86994da02a04e83370438d9bce9203eb2e3e4 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 13:19:34 +0200
Subject: [PATCH 09/24] releasing version 0.3.0+really0.2.2-0ubuntu0ppa1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 789dad36..d13bb231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nova (0.3.0+really0.2.2-0ubuntu0ppa1) lucid; urgency=low
+
+  * Upload to PPA.
+
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 12:47:43 +0200
+
 nova (0.2.2-6) UNRELEASED; urgency=low
 
   * Fix to make Key Injection work again

From 5dd4e0726cc117326b85ece8ae38e1cfc99f334b Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 13:20:13 +0200
Subject: [PATCH 10/24] Added --network_path setting to nova-compute's
 flagfile.

---
 debian/changelog         | 6 ++++++
 debian/nova-compute.conf | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d13bb231..90fe64a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nova (0.3.0+really0.2.2-0ubuntu0ppa1ubuntu1) UNRELEASED; urgency=low
+
+  * Added --network_path setting to nova-compute's flagfile.
+
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 13:20:11 +0200
+
 nova (0.3.0+really0.2.2-0ubuntu0ppa1) lucid; urgency=low
 
   * Upload to PPA.
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index 61ab4ceb..2c118114 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -2,4 +2,5 @@
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
 --keeper_path=/var/lib/nova/keeper
+--networks_path=/var/lib/nova/networks
 --fake_users=1

From 7c2cd2f17241eec414516367df98d1370e66363a Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 13:34:44 +0200
Subject: [PATCH 11/24] Move templates from python directories to
 /usr/share/nova.

---
 debian/changelog           | 1 +
 debian/nova-common.install | 6 +++---
 debian/nova-compute.conf   | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90fe64a8..c5756920 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nova (0.3.0+really0.2.2-0ubuntu0ppa1ubuntu1) UNRELEASED; urgency=low
 
   * Added --network_path setting to nova-compute's flagfile.
+  * Move templates from python directories to /usr/share/nova.
 
  -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 13:20:11 +0200
 
diff --git a/debian/nova-common.install b/debian/nova-common.install
index ab745531..acb1741e 100644
--- a/debian/nova-common.install
+++ b/debian/nova-common.install
@@ -1,5 +1,5 @@
 bin/nova-manage usr/bin
-nova/auth/novarc.template             usr/lib/pymodules/python2.6/nova/auth
-nova/cloudpipe/client.ovpn.template   usr/lib/pymodules/python2.6/nova/cloudpipe
-nova/compute/libvirt.xml.template     usr/lib/pymodules/python2.6/nova/compute
+nova/auth/novarc.template             usr/share/nova
+nova/cloudpipe/client.ovpn.template   usr/share/nova
+nova/compute/libvirt.xml.template     usr/share/nova
 usr/lib/python*/*-packages/nova/*
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index 2c118114..eaa48e2e 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -3,4 +3,7 @@
 --keys_path=/var/lib/nova/keys
 --keeper_path=/var/lib/nova/keeper
 --networks_path=/var/lib/nova/networks
+--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
 --fake_users=1

From 64a792550d197bd6f5cd006ea287c3869b17b63a Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 13:35:16 +0200
Subject: [PATCH 12/24] Fixed package version.

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c5756920..6ef85196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nova (0.3.0+really0.2.2-0ubuntu0ppa1ubuntu1) UNRELEASED; urgency=low
+nova (0.3.0+really0.2.2-0ubuntu0ppa2) UNRELEASED; urgency=low
 
   * Added --network_path setting to nova-compute's flagfile.
   * Move templates from python directories to /usr/share/nova.

From d45ef651d8ed66052c0252435ad0f0784f36c6a2 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 15:37:52 +0200
Subject: [PATCH 13/24] keeper_path is really caled datastore_path.

---
 debian/nova-api.conf         | 2 +-
 debian/nova-compute.conf     | 2 +-
 debian/nova-objectstore.conf | 2 +-
 debian/nova-volume.conf      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/nova-api.conf b/debian/nova-api.conf
index 4bf25fc7..9cd4051b 100644
--- a/debian/nova-api.conf
+++ b/debian/nova-api.conf
@@ -2,4 +2,4 @@
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
 --fake_users=1
---keeper_path=/var/lib/nova/keeper
+--datastore_path=/var/lib/nova/keeper
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index eaa48e2e..6eb0bc12 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -1,7 +1,7 @@
 --daemonize=1
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
---keeper_path=/var/lib/nova/keeper
+--datastore_path=/var/lib/nova/keeper
 --networks_path=/var/lib/nova/networks
 --libvirt_xml_template=/usr/share/nova/libvirt.xml.template
 --vpn_client_template=/usr/share/nova/client.ovpn.template
diff --git a/debian/nova-objectstore.conf b/debian/nova-objectstore.conf
index 7c3b633b..af3271d3 100644
--- a/debian/nova-objectstore.conf
+++ b/debian/nova-objectstore.conf
@@ -1,7 +1,7 @@
 --daemonize=1
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
---keeper_path=/var/lib/nova/keeper
+--datastore_path=/var/lib/nova/keeper
 --fake_users=1
 --images_path=/var/lib/nova/images
 --buckets_path=/var/lib/nova/buckets
diff --git a/debian/nova-volume.conf b/debian/nova-volume.conf
index 7c3b633b..af3271d3 100644
--- a/debian/nova-volume.conf
+++ b/debian/nova-volume.conf
@@ -1,7 +1,7 @@
 --daemonize=1
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
---keeper_path=/var/lib/nova/keeper
+--datastore_path=/var/lib/nova/keeper
 --fake_users=1
 --images_path=/var/lib/nova/images
 --buckets_path=/var/lib/nova/buckets

From cf5462ef42f4ab1d657fe254aeca32c05333bb4e Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 21:49:39 +0200
Subject: [PATCH 14/24] Add debian/nova-common.dirs to create
 var/lib/nova/{buckets,CA,images,instances,keys,networks}

---
 debian/changelog        | 2 ++
 debian/nova-common.dirs | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 debian/nova-common.dirs

diff --git a/debian/changelog b/debian/changelog
index 6ef85196..e86d654d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa2) UNRELEASED; urgency=low
 
   * 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}
 
  -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 13:20:11 +0200
 
diff --git a/debian/nova-common.dirs b/debian/nova-common.dirs
new file mode 100644
index 00000000..3c645d89
--- /dev/null
+++ b/debian/nova-common.dirs
@@ -0,0 +1,6 @@
+var/lib/nova/buckets
+var/lib/nova/CA
+var/lib/nova/images
+var/lib/nova/instances
+var/lib/nova/keys
+var/lib/nova/networks

From b688a33d87244a0616344a4ad617527a40d097e1 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 22:03:13 +0200
Subject: [PATCH 15/24] Don't pass --daemonize=1 to nova-compute. It's already
 daemonising by default.

---
 debian/changelog         | 2 ++
 debian/nova-compute.conf | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e86d654d..12963099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa2) UNRELEASED; urgency=low
   * 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.
 
  -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 13:20:11 +0200
 
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index 6eb0bc12..7fcac74b 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -1,4 +1,3 @@
---daemonize=1
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
 --datastore_path=/var/lib/nova/keeper

From 6439554e3210785e63ed6e022dbf3b84c00589cf Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 5 Jul 2010 22:07:41 +0200
Subject: [PATCH 16/24] releasing version 0.3.0+really0.2.2-0ubuntu0ppa2

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12963099..9518cc23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nova (0.3.0+really0.2.2-0ubuntu0ppa2) UNRELEASED; urgency=low
+nova (0.3.0+really0.2.2-0ubuntu0ppa2) lucid; urgency=low
 
   * Added --network_path setting to nova-compute's flagfile.
   * Move templates from python directories to /usr/share/nova.
@@ -7,7 +7,7 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa2) UNRELEASED; urgency=low
   * Don't pass --daemonize=1 to nova-compute. It's already daemonising
     by default.
 
- -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 13:20:11 +0200
+ -- Soren Hansen <soren@ubuntu.com>  Mon, 05 Jul 2010 22:06:54 +0200
 
 nova (0.3.0+really0.2.2-0ubuntu0ppa1) lucid; urgency=low
 

From e81c5d2b98a4396bd22aca23d5bf9822142b92a5 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 6 Jul 2010 13:34:08 +0200
Subject: [PATCH 17/24] Add a dependency on nginx from nova-objectsstore and
 install a suitable configuration file.

---
 debian/changelog                   |  7 +++++++
 debian/control                     |  2 +-
 debian/nova-objectstore.install    |  1 +
 debian/nova-objectstore.links      |  1 +
 debian/nova-objectstore.nginx.conf | 17 +++++++++++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 debian/nova-objectstore.links
 create mode 100644 debian/nova-objectstore.nginx.conf

diff --git a/debian/changelog b/debian/changelog
index 9518cc23..8c7f68d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
+
+  * Add a dependency on nginx from nova-objectsstore and install a
+    suitable configuration file.
+
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
+
 nova (0.3.0+really0.2.2-0ubuntu0ppa2) lucid; urgency=low
 
   * Added --network_path setting to nova-compute's flagfile.
diff --git a/debian/control b/debian/control
index c0b08ae8..3bfceaa2 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Description: Nova Cloud Computing - API frontend
 
 Package: nova-objectstore
 Architecture: all
-Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends: nova-common (= ${binary:Version}), nginx, ${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
diff --git a/debian/nova-objectstore.install b/debian/nova-objectstore.install
index 14a6dd37..590fcc01 100644
--- a/debian/nova-objectstore.install
+++ b/debian/nova-objectstore.install
@@ -1,2 +1,3 @@
 bin/nova-objectstore usr/bin
 debian/nova-objectstore.conf etc
+debian/nova-objectstore.nginx.conf etc/nginx/sites-available
diff --git a/debian/nova-objectstore.links b/debian/nova-objectstore.links
new file mode 100644
index 00000000..38e33948
--- /dev/null
+++ b/debian/nova-objectstore.links
@@ -0,0 +1 @@
+/etc/nginx/sites-available/nova-objectstore.nginx.conf /etc/nginx/sites-enabled/nova-objectstore.nginx.conf
diff --git a/debian/nova-objectstore.nginx.conf b/debian/nova-objectstore.nginx.conf
new file mode 100644
index 00000000..b6342415
--- /dev/null
+++ b/debian/nova-objectstore.nginx.conf
@@ -0,0 +1,17 @@
+server {
+  listen 3333 default;
+  server_name localhost;
+  client_max_body_size 10m;
+
+  access_log /var/log/nginx/localhost.access.log;
+
+  location ~ /_images/.+ {
+    root /var/lib/nova/images;
+    rewrite ^/_images/(.*)$ /$1 break;
+  }
+
+  location / {
+    proxy_pass http://localhost:3334/;
+  }
+}
+

From e5ab28e5bc482cc21a4a09f4541a36c8cf39bed4 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 6 Jul 2010 14:06:55 +0200
Subject: [PATCH 18/24] Ship the CA directory in nova-common.

---
 debian/changelog           | 1 +
 debian/nova-common.dirs    | 4 ++++
 debian/nova-common.install | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c7f68d1..d90a15ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
 
   * Add a dependency on nginx from nova-objectsstore and install a
     suitable configuration file.
+  * Ship the CA directory in nova-common.
 
  -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
 
diff --git a/debian/nova-common.dirs b/debian/nova-common.dirs
index 3c645d89..01443c4f 100644
--- a/debian/nova-common.dirs
+++ b/debian/nova-common.dirs
@@ -1,5 +1,9 @@
 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
diff --git a/debian/nova-common.install b/debian/nova-common.install
index acb1741e..da0ac65a 100644
--- a/debian/nova-common.install
+++ b/debian/nova-common.install
@@ -3,3 +3,6 @@ nova/auth/novarc.template             usr/share/nova
 nova/cloudpipe/client.ovpn.template   usr/share/nova
 nova/compute/libvirt.xml.template     usr/share/nova
 usr/lib/python*/*-packages/nova/*
+CA/openssl.cnf.tmpl                   var/lib/nova/CA
+CA/geninter.sh                        var/lib/nova/CA
+CA/genrootca.sh                       var/lib/nova/CA

From dd6e4ea6e91759d6cb284c1e1f722728ebab9b20 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 6 Jul 2010 17:34:43 +0200
Subject: [PATCH 19/24] Add a default flag file for nova-manage to help it find
 the CA.

---
 debian/changelog           | 1 +
 debian/nova-common.install | 1 +
 debian/nova-manage.conf    | 4 ++++
 3 files changed, 6 insertions(+)
 create mode 100644 debian/nova-manage.conf

diff --git a/debian/changelog b/debian/changelog
index d90a15ac..6b250016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
   * 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.
 
  -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
 
diff --git a/debian/nova-common.install b/debian/nova-common.install
index da0ac65a..f3d55404 100644
--- a/debian/nova-common.install
+++ b/debian/nova-common.install
@@ -1,4 +1,5 @@
 bin/nova-manage usr/bin
+debian/nova-manage.conf etc
 nova/auth/novarc.template             usr/share/nova
 nova/cloudpipe/client.ovpn.template   usr/share/nova
 nova/compute/libvirt.xml.template     usr/share/nova
diff --git a/debian/nova-manage.conf b/debian/nova-manage.conf
new file mode 100644
index 00000000..5ccda7ec
--- /dev/null
+++ b/debian/nova-manage.conf
@@ -0,0 +1,4 @@
+--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

From 983d805bf9fe66b32210cc73e6483824e59ac523 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 6 Jul 2010 17:35:33 +0200
Subject: [PATCH 20/24] If set, pass KernelId and RamdiskId from RunInstances
 call to the target compute node.

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b250016..5fb7c878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
     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.
 
  -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
 

From 7384fa067266992c37147fdb91af297df3bdad5e Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 6 Jul 2010 17:49:05 +0200
Subject: [PATCH 21/24] releasing version 0.3.0+really0.2.2-0ubuntu0ppa3

---
 debian/changelog         | 4 ++--
 debian/nova-compute.conf | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fb7c878..3d14ca7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
+nova (0.3.0+really0.2.2-0ubuntu0ppa3) lucid; urgency=low
 
   * Add a dependency on nginx from nova-objectsstore and install a
     suitable configuration file.
@@ -7,7 +7,7 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
   * If set, pass KernelId and RamdiskId from RunInstances call to the
     target compute node.
 
- -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 17:47:38 +0200
 
 nova (0.3.0+really0.2.2-0ubuntu0ppa2) lucid; urgency=low
 
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index 7fcac74b..5cd3f31f 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -1,6 +1,7 @@
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
 --datastore_path=/var/lib/nova/keeper
+--instances_path=/var/lib/nova/instances
 --networks_path=/var/lib/nova/networks
 --libvirt_xml_template=/usr/share/nova/libvirt.xml.template
 --vpn_client_template=/usr/share/nova/client.ovpn.template

From bec2499e1389d8ea8a5be9652589d23ec3cefc55 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 6 Jul 2010 22:28:55 +0200
Subject: [PATCH 22/24] Relax the Twisted dependency to python-twisted-core
 (rather than the full stack).

---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3d14ca7c..f78e8c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nova (0.3.0+really0.2.2-0ubuntu0ppa4) UNRELEASED; urgency=low
+
+  * Relax the Twisted dependency to python-twisted-core (rather than the
+    full stack).
+
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 22:28:28 +0200
+
 nova (0.3.0+really0.2.2-0ubuntu0ppa3) lucid; urgency=low
 
   * Add a dependency on nginx from nova-objectsstore and install a
diff --git a/debian/control b/debian/control
index 3bfceaa2..61f8cade 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ 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, python-daemon, python-redis, python-carrot, python-lockfile, python-gflags, python-tornado, ${misc:Depends}
+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

From 811985e564d82b767bee7d7ad7c247ea734af5b0 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Mon, 12 Jul 2010 10:39:01 -0500
Subject: [PATCH 23/24] Move nova related configuration files into /etc/nova/.

---
 debian/changelog                | 1 +
 debian/nova-api.init            | 2 +-
 debian/nova-api.install         | 2 +-
 debian/nova-common.dirs         | 1 +
 debian/nova-common.install      | 2 +-
 debian/nova-compute.init        | 2 +-
 debian/nova-compute.install     | 2 +-
 debian/nova-objectstore.init    | 2 +-
 debian/nova-objectstore.install | 2 +-
 debian/nova-volume.init         | 2 +-
 debian/nova-volume.install      | 2 +-
 11 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f78e8c13..4dfdb1de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nova (0.3.0+really0.2.2-0ubuntu0ppa4) UNRELEASED; urgency=low
 
   * Relax the Twisted dependency to python-twisted-core (rather than the
     full stack).
+  * Move nova related configuration files into /etc/nova/.
 
  -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 22:28:28 +0200
 
diff --git a/debian/nova-api.init b/debian/nova-api.init
index 77d9b244..597fbef9 100644
--- a/debian/nova-api.init
+++ b/debian/nova-api.init
@@ -13,7 +13,7 @@
 set -e
 
 DAEMON=/usr/bin/nova-api
-DAEMON_ARGS="--flagfile=/etc/nova-api.conf"
+DAEMON_ARGS="--flagfile=/etc/nova/nova-api.conf"
 PIDFILE=/var/run/nova-api.pid
 
 ENABLED=true
diff --git a/debian/nova-api.install b/debian/nova-api.install
index d1f5d7d5..02dbda02 100644
--- a/debian/nova-api.install
+++ b/debian/nova-api.install
@@ -1,2 +1,2 @@
 bin/nova-api usr/bin
-debian/nova-api.conf etc
+debian/nova-api.conf etc/nova
diff --git a/debian/nova-common.dirs b/debian/nova-common.dirs
index 01443c4f..b58fe8b7 100644
--- a/debian/nova-common.dirs
+++ b/debian/nova-common.dirs
@@ -1,3 +1,4 @@
+etc/nova
 var/lib/nova/buckets
 var/lib/nova/CA
 var/lib/nova/CA/INTER
diff --git a/debian/nova-common.install b/debian/nova-common.install
index f3d55404..92b5d3d4 100644
--- a/debian/nova-common.install
+++ b/debian/nova-common.install
@@ -1,5 +1,5 @@
 bin/nova-manage usr/bin
-debian/nova-manage.conf etc
+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
diff --git a/debian/nova-compute.init b/debian/nova-compute.init
index 820cf3d3..d0f093a7 100644
--- a/debian/nova-compute.init
+++ b/debian/nova-compute.init
@@ -13,7 +13,7 @@
 set -e
 
 DAEMON=/usr/bin/nova-compute
-DAEMON_ARGS="--flagfile=/etc/nova-compute.conf"
+DAEMON_ARGS="--flagfile=/etc/nova/nova-compute.conf"
 PIDFILE=/var/run/nova-compute.pid
 
 ENABLED=true
diff --git a/debian/nova-compute.install b/debian/nova-compute.install
index 20db74f1..5f9df46a 100644
--- a/debian/nova-compute.install
+++ b/debian/nova-compute.install
@@ -1,2 +1,2 @@
 bin/nova-compute usr/bin
-debian/nova-compute.conf etc
+debian/nova-compute.conf etc/nova
diff --git a/debian/nova-objectstore.init b/debian/nova-objectstore.init
index 7f37ac8a..9676345a 100644
--- a/debian/nova-objectstore.init
+++ b/debian/nova-objectstore.init
@@ -13,7 +13,7 @@
 set -e
 
 DAEMON=/usr/bin/nova-objectstore
-DAEMON_ARGS="--flagfile=/etc/nova-objectstore.conf"
+DAEMON_ARGS="--flagfile=/etc/nova/nova-objectstore.conf"
 PIDFILE=/var/run/nova-objectstore.pid
 
 ENABLED=true
diff --git a/debian/nova-objectstore.install b/debian/nova-objectstore.install
index 590fcc01..3ed93ff3 100644
--- a/debian/nova-objectstore.install
+++ b/debian/nova-objectstore.install
@@ -1,3 +1,3 @@
 bin/nova-objectstore usr/bin
-debian/nova-objectstore.conf etc
+debian/nova-objectstore.conf etc/nova
 debian/nova-objectstore.nginx.conf etc/nginx/sites-available
diff --git a/debian/nova-volume.init b/debian/nova-volume.init
index 069b4781..d5c2dddf 100644
--- a/debian/nova-volume.init
+++ b/debian/nova-volume.init
@@ -13,7 +13,7 @@
 set -e
 
 DAEMON=/usr/bin/nova-volume
-DAEMON_ARGS="--flagfile=/etc/nova-volume.conf"
+DAEMON_ARGS="--flagfile=/etc/nova/nova-volume.conf"
 PIDFILE=/var/run/nova-volume.pid
 
 ENABLED=true
diff --git a/debian/nova-volume.install b/debian/nova-volume.install
index e7e17201..9a840c78 100644
--- a/debian/nova-volume.install
+++ b/debian/nova-volume.install
@@ -1,2 +1,2 @@
 bin/nova-volume usr/bin
-debian/nova-volume.conf etc
+debian/nova-volume.conf etc/nova