Author: eelco
Date: Thu Jun 9 17:11:56 2011
New Revision: 27410
URL: https://svn.nixos.org/websvn/nix/?rev=27410&sc=1
Log:
* Update the Nova module for the Cactus release.
Modified:
nixos/trunk/modules/virtualisation/nova.nix
Modified: nixos/trunk/modules/virtualisation/nova.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/nova.nix Thu Jun 9 17:10:59 2011
(r27409)
+++ nixos/trunk/modules/virtualisation/nova.nix Thu Jun 9 17:11:56 2011
(r27410)
@@ -47,7 +47,7 @@
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 @@
# 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 @@
# `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 @@
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}";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
