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

Merge pull request #80346 from rnhmjoj/loaof

Browse Source 
tests: fix more loaOf deprecation warnings
This commit is contained in:
Danylo Hlynskyi 2020-02-17 21:03:40 +02:00 committed by GitHub
commit 69efb5cd34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixos/tests/glusterfs.nix
View File

@ -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";

14
nixos/tests/nfs/simple.nix
View File

@ -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
nixos/tests/orangefs.nix
View File

@ -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;