Merge pull request #120487 from lukegb/temp-ec2-fixed-disk
treewide: revert auto disk sizing for images
commit93de027ee045d0c1fbf13418fb86d86e6309b962
authorLuke Granger-Brown <git@lukegb.com>
dateSat 24 Apr 2021, 03:54 (6 years ago)
parentd97478e4fb91cb
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix+1
@@ -10,6 +10,7 @@ with lib;
1010
1111 system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
1212 inherit lib config pkgs;
13+ diskSize = 8192;
1314 format = "qcow2";
1415 configFile = pkgs.writeText "configuration.nix"
1516 ''
nixos/maintainers/scripts/ec2/amazon-image.nix+1−3
@@ -40,10 +40,8 @@ in {
4040 };
4141
4242 sizeMB = mkOption {
43− type = with types; either (enum [ "auto" ]) int;
44− # TODO(lukegb): this should be "auto"; see #120473
43+ type = types.int;
4544 default = if config.ec2.hvm then 2048 else 8192;
46− example = 8192;
4745 description = "The size in MB of the image";
4846 };
4947
nixos/maintainers/scripts/openstack/openstack-image.nix+1−1
@@ -12,8 +12,8 @@ with lib;
1212
1313 system.build.openstackImage = import ../../../lib/make-disk-image.nix {
1414 inherit lib config;
15− additionalSpace = "1024M";
1615 pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
16+ diskSize = 8192;
1717 format = "qcow2";
1818 configFile = pkgs.writeText "configuration.nix"
1919 ''
nixos/modules/virtualisation/azure-image.nix+2−3
@@ -9,9 +9,8 @@ in
99
1010 options = {
1111 virtualisation.azureImage.diskSize = mkOption {
12− type = with types; either (enum [ "auto" ]) int;
13− default = "auto";
14− example = 2048;
12+ type = with types; int;
13+ default = 2048;
1514 description = ''
1615 Size of disk image. Unit is MB.
1716 '';
nixos/modules/virtualisation/digital-ocean-image.nix+2−3
@@ -10,9 +10,8 @@ in
1010
1111 options = {
1212 virtualisation.digitalOceanImage.diskSize = mkOption {
13− type = with types; either (enum [ "auto" ]) int;
14− default = "auto";
15− example = 4096;
13+ type = with types; int;
14+ default = 4096;
1615 description = ''
1716 Size of disk image. Unit is MB.
1817 '';
nixos/modules/virtualisation/google-compute-image.nix+2−3
@@ -18,9 +18,8 @@ in
1818
1919 options = {
2020 virtualisation.googleComputeImage.diskSize = mkOption {
21− type = with types; either (enum [ "auto" ]) int;
22− default = "auto";
23− example = 1536;
21+ type = with types; int;
22+ default = 1536;
2423 description = ''
2524 Size of disk image. Unit is MB.
2625 '';
nixos/modules/virtualisation/hyperv-image.nix+2−3
@@ -9,9 +9,8 @@ in {
99 options = {
1010 hyperv = {
1111 baseImageSize = mkOption {
12− type = with types; either (enum [ "auto" ]) int;
13− default = "auto";
14− example = 2048;
12+ type = types.int;
13+ default = 2048;
1514 description = ''
1615 The size of the hyper-v base image in MiB.
1716 '';
nixos/modules/virtualisation/virtualbox-image.nix+2−3
@@ -11,9 +11,8 @@ in {
1111 options = {
1212 virtualbox = {
1313 baseImageSize = mkOption {
14− type = with types; either (enum [ "auto" ]) int;
15− default = "auto";
16− example = 50 * 1024;
14+ type = types.int;
15+ default = 50 * 1024;
1716 description = ''
1817 The size of the VirtualBox base image in MiB.
1918 '';
nixos/modules/virtualisation/vmware-image.nix+2−3
@@ -18,9 +18,8 @@ in {
1818 options = {
1919 vmware = {
2020 baseImageSize = mkOption {
21− type = with types; either (enum [ "auto" ]) int;
22− default = "auto";
23− example = 2048;
21+ type = types.int;
22+ default = 2048;
2423 description = ''
2524 The size of the VMWare base image in MiB.
2625 '';