cloud init migration
This commit is contained in:
@@ -4,6 +4,7 @@ let
|
||||
inherit (lib.${namespace}) mkOpt mkBoolOpt;
|
||||
|
||||
cfg = config.${namespace}.services.openiscsi;
|
||||
cloudInitEnabled = config.${namespace}.services.cloud-init.enable;
|
||||
in
|
||||
{
|
||||
options.${namespace}.services.openiscsi = {
|
||||
@@ -30,5 +31,27 @@ in
|
||||
ln -sf ${pkgs.openiscsi}/bin/iscsiadm /usr/bin/iscsiadm
|
||||
ln -sf ${pkgs.openiscsi}/bin/iscsid /usr/bin/iscsid
|
||||
'';
|
||||
|
||||
# Cloud Init Compatibility
|
||||
environment.etc."iscsi/initiatorname.iscsi".enable = mkIf cloudInitEnabled false;
|
||||
systemd.services.iscsi-initiator-setup = mkIf cloudInitEnabled {
|
||||
description = "Setup iSCSI Initiator Name";
|
||||
requires = [ "cloud-final.service" ];
|
||||
before = [ "iscsid.service" ];
|
||||
after = [ "cloud-final.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
|
||||
path = [ pkgs.hostname pkgs.util-linux ];
|
||||
script = ''
|
||||
mkdir -p /run/iscsi
|
||||
echo "InitiatorName=iqn.2025.org.nixos:$(hostname)" > /run/iscsi/initiatorname.iscsi
|
||||
mount --bind /run/iscsi/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, namespace, ... }:
|
||||
{ config, pkgs, lib, namespace, ... }:
|
||||
let
|
||||
inherit (lib) types mkIf;
|
||||
inherit (lib.${namespace}) mkOpt mkBoolOpt;
|
||||
@@ -32,6 +32,8 @@ in
|
||||
7946 # memberlist
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [ nfs-utils ];
|
||||
|
||||
networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [
|
||||
# RKE2 Ports - https://docs.rke2.io/install/requirements#networking
|
||||
8472 # Canal CNI with VXLAN
|
||||
@@ -41,5 +43,11 @@ in
|
||||
# MetalLB
|
||||
7946 # memberlist
|
||||
];
|
||||
|
||||
# Cloud Init
|
||||
systemd.services.rke2-server = mkIf config.${namespace}.services.cloud-init.enable {
|
||||
after = [ "cloud-final.service" ];
|
||||
requires = [ "cloud-final.service" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user