Author: eelco
Date: Mon Jun 20 14:27:06 2011
New Revision: 27504
URL: https://svn.nixos.org/websvn/nix/?rev=27504&sc=1
Log:
* Add an option virtualisation.nova.extraConfig.
Modified:
nixos/trunk/modules/virtualisation/nova.nix
Modified: nixos/trunk/modules/virtualisation/nova.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/nova.nix Mon Jun 20 14:26:49 2011
(r27503)
+++ nixos/trunk/modules/virtualisation/nova.nix Mon Jun 20 14:27:06 2011
(r27504)
@@ -14,6 +14,7 @@
''
--nodaemon
--verbose
+ ${cfg.extraConfig}
'';
in
@@ -40,6 +41,16 @@
'';
};
+ virtualisation.nova.extraConfig =
+ mkOption {
+ default = false;
+ description =
+ ''
+ Additional text appended to <filename>nova.conf</filename>,
+ the main Nova configuration file.
+ '';
+ };
+
};
@@ -50,9 +61,8 @@
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";
}
];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
