diff options
| author | Antoine Eiche <lewo@abesis.fr> | 2019-01-28 15:09:48 +0100 |
|---|---|---|
| committer | Antoine Eiche <lewo@abesis.fr> | 2019-02-11 20:58:44 +0100 |
| commit | d190b204f001d1446807f56eed99a73f8b89e244 (patch) | |
| tree | a4611c949d4f22b5dce7846382a27b266b212570 /nixos/maintainers/scripts | |
| parent | 849460f8789943b9758c6e782d1cc0bb8a8bd950 (diff) | |
| download | nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.tar nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.tar.gz nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.tar.bz2 nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.tar.lz nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.tar.xz nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.tar.zst nixpkgs-d190b204f001d1446807f56eed99a73f8b89e244.zip | |
Rename `novaImage` to `openstackImage`
People don't necessary know `nova` is related to Openstack (it is a component of Openstack). So, it is more explicit to call it `openstackImage`.
Diffstat (limited to 'nixos/maintainers/scripts')
| -rw-r--r-- | nixos/maintainers/scripts/openstack/nova-image.nix | 26 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/openstack/openstack-image.nix | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/nixos/maintainers/scripts/openstack/nova-image.nix b/nixos/maintainers/scripts/openstack/nova-image.nix deleted file mode 100644 index b6f3a5b1520..00000000000 --- a/nixos/maintainers/scripts/openstack/nova-image.nix +++ /dev/null @@ -1,26 +0,0 @@ -# nix-build '<nixpkgs/nixos>' -A config.system.build.novaImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/nova-image.nix ]; }" - -{ 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> ]; - } - ''; - }; - -} diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix new file mode 100644 index 00000000000..4c464f43f61 --- /dev/null +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -0,0 +1,26 @@ +# nix-build '<nixpkgs/nixos>' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = + [ ../../../modules/installer/cd-dvd/channel.nix + ../../../modules/virtualisation/openstack-config.nix + ]; + + system.build.openstackImage = 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/openstack-config.nix> ]; + } + ''; + }; + +} |