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] 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