public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Update the Nova module for the Cactus release.

Browse Source 
svn path=/nixos/trunk/; revision=27410
This commit is contained in:
Eelco Dolstra 2011-06-09 17:11:56 +00:00
parent c2a3aa8e79
commit e9a567f8d2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/virtualisation/nova.nix
View File

@ -47,7 +47,7 @@ in
config = mkIf cfg.enableSingleNode { config = mkIf cfg.enableSingleNode {
environment.systemPackages = [ nova pkgs.euca2ools ]; environment.systemPackages = [ nova pkgs.euca2ools pkgs.novaclient ];
environment.etc = environment.etc =
[ # The Paste configuration file for nova-api. [ # The Paste configuration file for nova-api.
@ -73,7 +73,6 @@ in
# Allow the CA certificate generation script (called by # Allow the CA certificate generation script (called by
# nova-api) to work. # nova-api) to work.
mkdir -m 700 -p /var/lib/nova/CA /var/lib/nova/CA/private 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. # Initialise the SQLite database.
${nova}/bin/nova-manage db sync ${nova}/bin/nova-manage db sync
@ -91,9 +90,11 @@ in
# `openssl' is required to generate the CA. `openssh' is # `openssl' is required to generate the CA. `openssh' is
# required to generate key pairs. # required to generate key pairs.
path = [ pkgs.openssl pkgs.openssh ]; path = [ pkgs.openssl pkgs.openssh pkgs.bash ];
exec = "${nova}/bin/nova-api --flagfile=${novaConf}"; 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 # `nova-objectstore' is a simple image server. Useful if you're
@ -135,7 +136,8 @@ in
path = path =
[ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm [ 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}"; exec = "${nova}/bin/nova-compute --flagfile=${novaConf}";