nova-image: refactoring
The nova image configuration is separated from the image build.
This commit is contained in:
Antoine Eiche
parent
1c555e772e
commit
dec7ecbbbc
24
nixos/maintainers/scripts/openstack/nova-image.nix
Normal file
24
nixos/maintainers/scripts/openstack/nova-image.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ ../../../modules/installer/cd-dvd/channel.nix
|
||||||
|
../../../modules/virtualisation/nova-config.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
system.build.novaImage = import ../../../lib/make-disk-image.nix {
|
||||||
|
inherit lib config;
|
||||||
|
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
|
||||||
|
diskSize = 8192;
|
||||||
|
format = "qcow2";
|
||||||
|
configFile = pkgs.writeText "configuration.nix"
|
||||||
|
''
|
||||||
|
{
|
||||||
|
imports = [ <nixpkgs/nixos/modules/virtualisation/nova-config.nix> ];
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
51
nixos/modules/virtualisation/nova-config.nix
Normal file
51
nixos/modules/virtualisation/nova-config.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../profiles/qemu-guest.nix
|
||||||
|
../profiles/headless.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
config = {
|
||||||
|
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
||||||
|
|
||||||
|
boot.kernelParams = [ "console=ttyS0" ];
|
||||||
|
boot.loader.grub.device = "/dev/vda";
|
||||||
|
boot.loader.timeout = 0;
|
||||||
|
|
||||||
|
# Allow root logins
|
||||||
|
services.openssh.enable = true;
|
||||||
|
services.openssh.permitRootLogin = "prohibit-password";
|
||||||
|
|
||||||
|
# Put /tmp and /var on /ephemeral0, which has a lot more space.
|
||||||
|
# Unfortunately we can't do this with the `fileSystems' option
|
||||||
|
# because it has no support for creating the source of a bind
|
||||||
|
# mount. Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
|
||||||
|
# mount on top of it so we have a lot more space for Nix operations.
|
||||||
|
|
||||||
|
/*
|
||||||
|
boot.initrd.postMountCommands =
|
||||||
|
''
|
||||||
|
mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
|
||||||
|
mkdir -m 1777 -p $targetRoot/tmp
|
||||||
|
mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
|
||||||
|
|
||||||
|
mkdir -m 755 -p $targetRoot/ephemeral0/var
|
||||||
|
mkdir -m 755 -p $targetRoot/var
|
||||||
|
mount --bind $targetRoot/ephemeral0/var $targetRoot/var
|
||||||
|
|
||||||
|
mkdir -p /unionfs-chroot/ro-nix
|
||||||
|
mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
|
||||||
|
|
||||||
|
mkdir -p /unionfs-chroot/rw-nix
|
||||||
|
mkdir -m 755 -p $targetRoot/ephemeral0/nix
|
||||||
|
mount --rbind $targetRoot/ephemeral0/nix /unionfs-chroot/rw-nix
|
||||||
|
unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
|
||||||
|
'';
|
||||||
|
|
||||||
|
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
|
||||||
|
*/
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
# Usage:
|
|
||||||
# $ NIXOS_CONFIG=`pwd`/nixos/modules/virtualisation/nova-image.nix nix-build '<nixpkgs/nixos>' -A config.system.build.novaImage
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
{
|
|
||||||
system.build.novaImage = import ../../lib/make-disk-image.nix {
|
|
||||||
inherit pkgs lib config;
|
|
||||||
partitioned = true;
|
|
||||||
diskSize = 1 * 1024;
|
|
||||||
configFile = pkgs.writeText "configuration.nix"
|
|
||||||
''
|
|
||||||
{
|
|
||||||
imports = [ <nixpkgs/nixos/modules/virtualisation/nova-image.nix> ];
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
../profiles/qemu-guest.nix
|
|
||||||
../profiles/headless.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
|
||||||
|
|
||||||
boot.kernelParams = [ "console=ttyS0" ];
|
|
||||||
boot.loader.grub.device = "/dev/vda";
|
|
||||||
boot.loader.timeout = 0;
|
|
||||||
|
|
||||||
# Allow root logins
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.permitRootLogin = "prohibit-password";
|
|
||||||
|
|
||||||
# Put /tmp and /var on /ephemeral0, which has a lot more space.
|
|
||||||
# Unfortunately we can't do this with the `fileSystems' option
|
|
||||||
# because it has no support for creating the source of a bind
|
|
||||||
# mount. Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
|
|
||||||
# mount on top of it so we have a lot more space for Nix operations.
|
|
||||||
|
|
||||||
/*
|
|
||||||
boot.initrd.postMountCommands =
|
|
||||||
''
|
|
||||||
mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
|
|
||||||
mkdir -m 1777 -p $targetRoot/tmp
|
|
||||||
mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
|
|
||||||
|
|
||||||
mkdir -m 755 -p $targetRoot/ephemeral0/var
|
|
||||||
mkdir -m 755 -p $targetRoot/var
|
|
||||||
mount --bind $targetRoot/ephemeral0/var $targetRoot/var
|
|
||||||
|
|
||||||
mkdir -p /unionfs-chroot/ro-nix
|
|
||||||
mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
|
|
||||||
|
|
||||||
mkdir -p /unionfs-chroot/rw-nix
|
|
||||||
mkdir -m 755 -p $targetRoot/ephemeral0/nix
|
|
||||||
mount --rbind $targetRoot/ephemeral0/nix /unionfs-chroot/rw-nix
|
|
||||||
unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
|
|
||||||
'';
|
|
||||||
|
|
||||||
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
|
|
||||||
*/
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user