flake: add SAP CHV and libvirt to NixOS modules

On-behalf-of: SAP [email protected]

Author: phip1611

flake.nix

@@ -82,7 +82,10 @@
 
         checks = import ./checks { inherit pkgs pre-commit-hooks-run; };
 
-        nixosModules = import ./modules { openstackPkgs = packages; };
+        nixosModules = import ./modules {
+          openstackPkgs = packages;
+          inherit self;
+        };
 
         tests = import ./tests/default.nix {
           inherit pkgs nixosModules;

modules/chv-sap.nix

@@ -0,0 +1,16 @@
+# Ensures libvirt and Cloud Hypervisor are set with the proper sources for SAP
+# (for gardenlinux).
+
+# Function returning a NixOS Module
+{ self }:
+
+# NixOS Module start
+{ pkgs, ... }:
+{
+  virtualisation.libvirtd.package = pkgs.libvirt;
+  nixpkgs.overlays = [
+    (prev: final: {
+      inherit (self.packages.${pkgs.system}) cloud-hypervisor;
+    })
+  ];
+}

modules/default.nix

@@ -1,4 +1,4 @@
-{ openstackPkgs }:
+{ openstackPkgs, self }:
 {
   controllerModule = import ./controller/openstack-controller.nix {
     inherit (openstackPkgs)
@@ -14,4 +14,6 @@
   computeModule = import ./compute/compute.nix { inherit (openstackPkgs) neutron nova; };
 
   testModules = import ./testing { };
+
+  chv-sap = import ./chv-sap.nix { inherit self; };
 }

tests/openstack-default-setup.nix

@@ -20,6 +20,7 @@ pkgs.nixosTest {
       imports = [
         nixosModules.computeModule
         nixosModules.testModules.testCompute
+        nixosModules.chv-sap
       ];
     };
 

tests/openstack-live-migration.nix

@@ -130,6 +130,7 @@ pkgs.nixosTest {
       imports = [
         nixosModules.computeModule
         nixosModules.testModules.testCompute
+        nixosModules.chv-sap
         (novaConfigForIp "10.0.0.39")
       ];
 
@@ -153,6 +154,7 @@ pkgs.nixosTest {
       imports = [
         nixosModules.computeModule
         nixosModules.testModules.testCompute
+        nixosModules.chv-sap
         (novaConfigForIp "10.0.0.40")
       ];