diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-27 11:10:19 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-27 11:10:19 +0200 |
| commit | c4ffa57d4076b4aa5ed6262cdc2fece731b6875d (patch) | |
| tree | 83267302ef3792aa5f0273beff3e5257cda4bf7f /debian | |
| parent | 9641dac5d0cbfd8d1f3026e1bae5749b9d8e00fc (diff) | |
| parent | fae70b1a769f52cc4730e04fcec8fe82cc8bd1c6 (diff) | |
| download | nova-c4ffa57d4076b4aa5ed6262cdc2fece731b6875d.tar.gz nova-c4ffa57d4076b4aa5ed6262cdc2fece731b6875d.tar.xz nova-c4ffa57d4076b4aa5ed6262cdc2fece731b6875d.zip | |
Merge with trunk.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/nova-api.conf | 1 | ||||
| -rw-r--r-- | debian/nova-common.install | 5 | ||||
| -rw-r--r-- | debian/nova-compute.conf | 1 | ||||
| -rw-r--r-- | debian/nova-dhcpbridge.conf (renamed from debian/nova-dhcp.conf) | 1 | ||||
| -rw-r--r-- | debian/nova-objectstore.conf | 1 | ||||
| -rw-r--r-- | debian/nova-volume.conf | 1 |
6 files changed, 2 insertions, 8 deletions
diff --git a/debian/nova-api.conf b/debian/nova-api.conf index d0b796878..3e6c056ad 100644 --- a/debian/nova-api.conf +++ b/debian/nova-api.conf @@ -3,4 +3,3 @@ --keys_path=/var/lib/nova/keys --networks_path=/var/lib/nova/networks --dhcpbridge_flagfile=/etc/nova/nova-dhcpbridge.conf ---fake_users=1 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-compute.conf b/debian/nova-compute.conf index d862f2328..11de13ff6 100644 --- a/debian/nova-compute.conf +++ b/debian/nova-compute.conf @@ -5,4 +5,3 @@ --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 diff --git a/debian/nova-dhcp.conf b/debian/nova-dhcpbridge.conf index 0aafe7549..68cb8903e 100644 --- a/debian/nova-dhcp.conf +++ b/debian/nova-dhcpbridge.conf @@ -1,2 +1 @@ --networks_path=/var/lib/nova/networks ---fake_users=1 diff --git a/debian/nova-objectstore.conf b/debian/nova-objectstore.conf index 03f5df051..8eca39715 100644 --- a/debian/nova-objectstore.conf +++ b/debian/nova-objectstore.conf @@ -1,6 +1,5 @@ --daemonize=1 --ca_path=/var/lib/nova/CA --keys_path=/var/lib/nova/keys ---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 7899e30c4..57e3411a0 100644 --- a/debian/nova-volume.conf +++ b/debian/nova-volume.conf @@ -1,5 +1,4 @@ --ca_path=/var/lib/nova/CA --keys_path=/var/lib/nova/keys ---fake_users=1 --images_path=/var/lib/nova/images --buckets_path=/var/lib/nova/buckets |