From 3cb5ea79bd4b0794f5b6214bfc7da4a3320cba42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Jun 2011 14:27:06 +0000
Subject: [PATCH] * Add an option virtualisation.nova.extraConfig.

svn path=/nixos/trunk/; revision=27504
---
 modules/virtualisation/nova.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/virtualisation/nova.nix b/modules/virtualisation/nova.nix
index f76c97088ee..fa26b7d54ea 100644
--- a/modules/virtualisation/nova.nix
+++ b/modules/virtualisation/nova.nix
@@ -14,6 +14,7 @@ let
     ''
       --nodaemon
       --verbose
+      ${cfg.extraConfig}
     '';
 
 in
@@ -40,6 +41,16 @@ in
           '';
       };
 
+    virtualisation.nova.extraConfig = 
+      mkOption {
+        default = false;
+        description =
+          ''
+            Additional text appended to <filename>nova.conf</filename>,
+            the main Nova configuration file.
+          '';
+      };
+
   };
 
 
@@ -50,9 +61,8 @@ in
     environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
 
     environment.etc =
-      [ # The Paste configuration file for nova-api.
-        { source = "${nova}/etc/nova/nova-api.conf";
-          target = "nova/nova-api.conf";
+      [ { source = novaConf;
+          target = "nova/nova.conf";
         }
       ];