From e9a567f8d2f11b761dc8e9da698de7ba0b2727bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jun 2011 17:11:56 +0000
Subject: [PATCH] * Update the Nova module for the Cactus release.

svn path=/nixos/trunk/; revision=27410
---
 modules/virtualisation/nova.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index 6b0276f76c6a..f76c97088ee2 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -47,7 +47,7 @@ in
 
   config = mkIf cfg.enableSingleNode {
 
-    environment.systemPackages = [ nova pkgs.euca2ools ];
+    environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
 
     environment.etc =
       [ # The Paste configuration file for nova-api.
@@ -73,7 +73,6 @@ in
         # Allow the CA certificate generation script (called by
         # nova-api) to work.
         mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private
-        cp -p ${nova}/libexec/nova/openssl.cnf.tmpl /var/lib/nova/CA/
 
         # Initialise the SQLite database.        
         ${nova}/bin/nova-manage db sync
@@ -91,9 +90,11 @@ in
 
         # `openssl' is required to generate the CA.  `openssh' is
         # required to generate key pairs.
-        path = [ pkgs.openssl pkgs.openssh ];
-          
-        exec = "${nova}/bin/nova-api --flagfile=${novaConf}";
+        path = [ pkgs.openssl pkgs.openssh pkgs.bash ];
+
+        respawn = false;
+        
+        exec = "${nova}/bin/nova-api --flagfile=${novaConf} --api_paste_config=${nova}/etc/nova/api-paste.ini";
       };
 
     # `nova-objectstore' is a simple image server.  Useful if you're
@@ -135,7 +136,8 @@ in
 
         path =
           [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
-            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools
+            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute
+            pkgs.bridge_utils
           ];
 
         exec = "${nova}/bin/nova-compute --flagfile=${novaConf}";