Merged with trunk, since a lot of useful things have gone in there recently.

10 files changed, 6 insertions, 25 deletions

diff --git a/debian/control b/debian/control
index 17414bb7a..a6d12f36e 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}), nginx, ${python:Depends}, ${misc:Depends}
+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
diff --git a/debian/nova-api.conf b/debian/nova-api.conf
index 9cd4051b1..d0b796878 100644
--- a/debian/nova-api.conf
+++ b/debian/nova-api.conf
@@ -1,5 +1,6 @@
 --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
 --fake_users=1
---datastore_path=/var/lib/nova/keeper
diff --git a/debian/nova-api.install b/debian/nova-api.install
index 02dbda02d..89615d302 100644
--- a/debian/nova-api.install
+++ b/debian/nova-api.install
@@ -1,2 +1,3 @@
 bin/nova-api usr/bin
 debian/nova-api.conf etc/nova
+debian/nova-dhcpbridge.conf etc/nova
diff --git a/debian/nova-compute.conf b/debian/nova-compute.conf
index e4ca3fe95..d862f2328 100644
--- a/debian/nova-compute.conf
+++ b/debian/nova-compute.conf
@@ -1,8 +1,6 @@
 --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
 --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
diff --git a/debian/nova-dhcp.conf b/debian/nova-dhcp.conf
new file mode 100644
index 000000000..0aafe7549
--- /dev/null
+++ b/debian/nova-dhcp.conf
@@ -0,0 +1,2 @@
+--networks_path=/var/lib/nova/networks
+--fake_users=1
diff --git a/debian/nova-objectstore.conf b/debian/nova-objectstore.conf
index af3271d3b..03f5df051 100644
--- a/debian/nova-objectstore.conf
+++ b/debian/nova-objectstore.conf
@@ -1,7 +1,6 @@
 --daemonize=1
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
---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-objectstore.install b/debian/nova-objectstore.install
index 3ed93ff37..c5b3d997a 100644
--- a/debian/nova-objectstore.install
+++ b/debian/nova-objectstore.install
@@ -1,3 +1,2 @@
 bin/nova-objectstore usr/bin
 debian/nova-objectstore.conf etc/nova
-debian/nova-objectstore.nginx.conf etc/nginx/sites-available
diff --git a/debian/nova-objectstore.links b/debian/nova-objectstore.links
deleted file mode 100644
index 38e33948e..000000000
--- a/debian/nova-objectstore.links
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index b63424150..000000000
--- a/debian/nova-objectstore.nginx.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-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/;
-  }
-}
-
diff --git a/debian/nova-volume.conf b/debian/nova-volume.conf
index af3271d3b..03f5df051 100644
--- a/debian/nova-volume.conf
+++ b/debian/nova-volume.conf
@@ -1,7 +1,6 @@
 --daemonize=1
 --ca_path=/var/lib/nova/CA
 --keys_path=/var/lib/nova/keys
---datastore_path=/var/lib/nova/keeper
 --fake_users=1
 --images_path=/var/lib/nova/images
 --buckets_path=/var/lib/nova/buckets