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

Rename novaImage to openstackImage

Browse Source 
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`.
This commit is contained in:
Antoine Eiche 2019-01-28 15:09:48 +01:00
parent 849460f878
commit d190b204f0
5 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nixos/maintainers/scripts/openstack/nova-image.nix
View File

@ -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> ];
}
'';
};
}

26
nixos/maintainers/scripts/openstack/openstack-image.nix Normal file
View File

@ -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> ];
}
'';
};
}

2
nixos/modules/virtualisation/nova-config.nix → nixos/modules/virtualisation/openstack-config.nix
View File

@ -29,7 +29,7 @@ with lib;
passwordAuthentication = mkDefault false;
};
systemd.services.nova-init = {
systemd.services.openstack-init = {
path = [ pkgs.wget ];
description = "Fetch Metadata on startup";
wantedBy = [ "multi-user.target" ];

3
nixos/tests/all-tests.nix
View File

@ -159,6 +159,9 @@ in
openldap = handleTest ./openldap.nix {};
opensmtpd = handleTest ./opensmtpd.nix {};
openssh = handleTest ./openssh.nix {};
# openstack-image-userdata doesn't work in a sandbox as the simulated openstack instance needs network access
#openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
osquery = handleTest ./osquery.nix {};
ostree = handleTest ./ostree.nix {};
pam-oath-login = handleTest ./pam-oath-login.nix {};

10
nixos/tests/nova-image.nix → nixos/tests/openstack-image.nix
View File

@ -13,15 +13,15 @@ let
(import ../lib/eval-config.nix {
inherit system;
modules = [
../maintainers/scripts/openstack/nova-image.nix
../maintainers/scripts/openstack/openstack-image.nix
../modules/testing/test-instrumentation.nix
../modules/profiles/qemu-guest.nix
];
}).config.system.build.novaImage;
}).config.system.build.openstackImage;
in {
metadata = makeEc2Test {
name = "nova-ec2-metadata";
name = "openstack-ec2-metadata";
inherit image;
sshPublicKey = snakeOilPublicKey;
userData = ''
@ -59,14 +59,14 @@ in {
};
userdata = makeEc2Test {
name = "nova-ec2-metadata";
name = "openstack-ec2-metadata";
inherit image;
sshPublicKey = snakeOilPublicKey;
userData = ''
{ pkgs, ... }:
{
imports = [
<nixpkgs/nixos/modules/virtualisation/nova-config.nix>
<nixpkgs/nixos/modules/virtualisation/openstack-config.nix>
<nixpkgs/nixos/modules/testing/test-instrumentation.nix>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
];