summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2010-07-28 00:32:17 +0000
committerDevin Carlen <devin.carlen@gmail.com>2010-07-28 00:32:17 +0000
commit96a643709211df2196f5cbc0a193a0d0ec4e0f06 (patch)
tree35eddf221f9364af4b7e10f7bf4e023123ea9c34 /debian
parent40dfe6316fae4b14f9fa694653341349a86d55ab (diff)
parent4041902703576d955b2d4b9fd78b6961c0c03377 (diff)
downloadnova-96a643709211df2196f5cbc0a193a0d0ec4e0f06.tar.gz
nova-96a643709211df2196f5cbc0a193a0d0ec4e0f06.tar.xz
nova-96a643709211df2196f5cbc0a193a0d0ec4e0f06.zip
Merged trunk
Diffstat (limited to 'debian')
-rw-r--r--debian/nova-common.install5
-rw-r--r--debian/nova-dhcpbridge.conf (renamed from debian/nova-dhcp.conf)0
2 files changed, 2 insertions, 3 deletions
diff --git a/debian/nova-common.install b/debian/nova-common.install
index 9b1bbf147..93251363a 100644
--- a/debian/nova-common.install
+++ b/debian/nova-common.install
@@ -1,10 +1,9 @@
-bin/nova-manage usr/bin
-debian/nova-manage.conf etc/nova
+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
-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
diff --git a/debian/nova-dhcp.conf b/debian/nova-dhcpbridge.conf
index 68cb8903e..68cb8903e 100644
--- a/debian/nova-dhcp.conf
+++ b/debian/nova-dhcpbridge.conf