MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #120487 from lukegb/temp-ec2-fixed-disk

Browse source 
treewide: revert auto disk sizing for images
This commit is contained in:
Luke Granger-Brown 2021-04-24 03:54:42 +01:00 committed by GitHub
commit 93de027ee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
View file

@ -10,6 +10,7 @@ with lib;
system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
inherit lib config pkgs;
diskSize = 8192;
format = "qcow2";
configFile = pkgs.writeText "configuration.nix"
''

4
nixos/maintainers/scripts/ec2/amazon-image.nix
View file

@ -40,10 +40,8 @@ in {
};
sizeMB = mkOption {
type = with types; either (enum [ "auto" ]) int;
# TODO(lukegb): this should be "auto"; see #120473
type = types.int;
default = if config.ec2.hvm then 2048 else 8192;
example = 8192;
description = "The size in MB of the image";
};

2
nixos/maintainers/scripts/openstack/openstack-image.nix
View file

@ -12,8 +12,8 @@ with lib;
system.build.openstackImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
additionalSpace = "1024M";
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
diskSize = 8192;
format = "qcow2";
configFile = pkgs.writeText "configuration.nix"
''

5
nixos/modules/virtualisation/azure-image.nix
View file

@ -9,9 +9,8 @@ in
options = {
virtualisation.azureImage.diskSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 2048;
type = with types; int;
default = 2048;
description = ''
Size of disk image. Unit is MB.
'';

5
nixos/modules/virtualisation/digital-ocean-image.nix
View file

@ -10,9 +10,8 @@ in
options = {
virtualisation.digitalOceanImage.diskSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 4096;
type = with types; int;
default = 4096;
description = ''
Size of disk image. Unit is MB.
'';

5
nixos/modules/virtualisation/google-compute-image.nix
View file

@ -18,9 +18,8 @@ in
options = {
virtualisation.googleComputeImage.diskSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 1536;
type = with types; int;
default = 1536;
description = ''
Size of disk image. Unit is MB.
'';

5
nixos/modules/virtualisation/hyperv-image.nix
View file

@ -9,9 +9,8 @@ in {
options = {
hyperv = {
baseImageSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 2048;
type = types.int;
default = 2048;
description = ''
The size of the hyper-v base image in MiB.
'';

5
nixos/modules/virtualisation/virtualbox-image.nix
View file

@ -11,9 +11,8 @@ in {
options = {
virtualbox = {
baseImageSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 50 * 1024;
type = types.int;
default = 50 * 1024;
description = ''
The size of the VirtualBox base image in MiB.
'';

5
nixos/modules/virtualisation/vmware-image.nix
View file

@ -18,9 +18,8 @@ in {
options = {
vmware = {
baseImageSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 2048;
type = types.int;
default = 2048;
description = ''
The size of the VMWare base image in MiB.
'';