tests: fix more loaOf deprecation warnings
This commit is contained in:
parent
3b7f5c6762
commit
d7bc3a7534
|
@ -4,10 +4,11 @@ let
|
|||
client = { pkgs, ... } : {
|
||||
environment.systemPackages = [ pkgs.glusterfs ];
|
||||
fileSystems = pkgs.lib.mkVMOverride
|
||||
[ { mountPoint = "/gluster";
|
||||
fsType = "glusterfs";
|
||||
device = "server1:/gv0";
|
||||
} ];
|
||||
{ "/gluster" =
|
||||
{ device = "server1:/gv0";
|
||||
fsType = "glusterfs";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
server = { pkgs, ... } : {
|
||||
|
@ -22,11 +23,11 @@ let
|
|||
virtualisation.emptyDiskImages = [ 1024 ];
|
||||
|
||||
fileSystems = pkgs.lib.mkVMOverride
|
||||
[ { mountPoint = "/data";
|
||||
device = "/dev/disk/by-label/data";
|
||||
fsType = "ext4";
|
||||
}
|
||||
];
|
||||
{ "/data" =
|
||||
{ device = "/dev/disk/by-label/data";
|
||||
fsType = "ext4";
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
name = "glusterfs";
|
||||
|
|
|
@ -5,13 +5,13 @@ let
|
|||
client =
|
||||
{ pkgs, ... }:
|
||||
{ fileSystems = pkgs.lib.mkVMOverride
|
||||
[ { mountPoint = "/data";
|
||||
# nfs4 exports the export with fsid=0 as a virtual root directory
|
||||
device = if (version == 4) then "server:/" else "server:/data";
|
||||
fsType = "nfs";
|
||||
options = [ "vers=${toString version}" ];
|
||||
}
|
||||
];
|
||||
{ "/data" =
|
||||
{ # nfs4 exports the export with fsid=0 as a virtual root directory
|
||||
device = if (version == 4) then "server:/" else "server:/data";
|
||||
fsType = "nfs";
|
||||
options = [ "vers=${toString version}" ];
|
||||
};
|
||||
};
|
||||
networking.firewall.enable = false; # FIXME: only open statd
|
||||
};
|
||||
|
||||
|
|
|
@ -10,11 +10,11 @@ let
|
|||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
|
||||
fileSystems = pkgs.lib.mkVMOverride
|
||||
[ { mountPoint = "/data";
|
||||
device = "/dev/disk/by-label/data";
|
||||
fsType = "ext4";
|
||||
}
|
||||
];
|
||||
{ "/data" =
|
||||
{ device = "/dev/disk/by-label/data";
|
||||
fsType = "ext4";
|
||||
};
|
||||
};
|
||||
|
||||
services.orangefs.server = {
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in a new issue